Page MenuHomeHEPForge

No OneTemporary

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd1babe..b0b5d74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,19 @@
stages:
- compile
# - test
compile:
stage: compile
before_script:
- yum install -y -q gsl gsl-devel libgfortran gcc-gfortran
- mkdir build
- cd build
- - wget https://raw.githubusercontent.com/opencog/opencog/master/lib/FindGSL.cmake
- - wget https://raw.githubusercontent.com/ibab/lhcb-software/master/LbScripts/LbUtils/cmake/modules/FindHepMC.cmake
script:
- cmake -D CMAKE_MODULE_PATH=$PWD ..
- make -j 4
#test:
# stage: test
# script:
# - make test/probe_physics_processes
# - test/probe_physics_processes lpair elastic
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9ad994..451fb2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,95 +1,95 @@
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
project(CepGen)
set(PROJECT_VERSION 1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic -std=c++14 -g")
#----- define all individual modules to be built beforehand
set(MODULES core processes hadronisers physics export)
#----- enable fortran (for Pythia/Herwig/...)
enable_language(Fortran OPTIONAL)
#----- include external hadronisers/...
add_subdirectory(external)
if(EXISTS $ENV{has_pythia6})
add_definitions(-DPYTHIA6)
endif()
if(EXISTS $ENV{has_herwig})
add_definitions(-DHERWIG)
endif()
if(EXISTS $ENV{has_jetset})
add_definitions(-DJETSET)
endif()
if(EXISTS $ENV{has_grv})
add_definitions(-DGRVPDF)
endif()
#----- build all the intermediate objects
include_directories(${PROJECT_SOURCE_DIR})
foreach(_module ${MODULES})
include_directories(${PROJECT_SOURCE_DIR}/${_module})
add_subdirectory(${_module})
endforeach()
#----- link everything into the executables
add_executable(cepgen main.cpp)
target_link_libraries(cepgen CepGenCore CepGenExternalHadronisers CepGenPhysics CepGenProcesses)
if($ENV{HOSTNAME} MATCHES "^lxplus[0-9]+.cern.ch")
set(BASE_DIR "/cvmfs/sft.cern.ch/lcg/external")
set(GSL_DIR "${BASE_DIR}/GSL/1.14/x86_64-slc5-gcc44-opt")
set(HEPMC_DIR "${BASE_DIR}/HepMC/2.06.08/x86_64-slc6-gcc48-opt")
message(STATUS "Compiling on LXPLUS. Do not forget to source the environment variables!")
find_library(GSL_LIB gsl HINTS "${GSL_DIR}/lib")
find_library(GSL_CBLAS_LIB gslcblas HINTS "${GSL_DIR}/lib")
#--- searching for HepMC
find_library(HEPMC_LIB HepMC HINTS "${HEPMC_DIR}/lib")
find_library(HEPMC_FIO_LIB HepMCfio HINTS "${HEPMC_DIR}/lib")
find_path(HEPMC_INCLUDE HepMC HINTS "${HEPMC_DIR}/include")
else()
find_library(GSL_LIB gsl)
find_library(GSL_CBLAS_LIB gslcblas)
find_library(HEPMC_LIB HepMC)
find_path(HEPMC_INCLUDE HepMC)
endif()
-find_package(ROOT)
if(HEPMC_LIB)
message(STATUS "HepMC found in " ${HEPMC_INCLUDE})
+ find_package(ROOT)
include_directories(${HEPMC_INCLUDE})
add_executable(cepgen-lhe cepgen-lhe.cpp)
if(ROOT_LIBRARIES)
target_link_libraries(cepgen-lhe ${HEPMC_LIB} ${ROOT_LIBRARIES} CepGenCore CepGenExternalHadronisers CepGenPhysics CepGenProcesses CepGenExporter)
else()
target_link_libraries(cepgen-lhe ${HEPMC_LIB} CepGenCore CepGenExternalHadronisers CepGenPhysics CepGenProcesses CepGenExporter)
endif()
endif()
#----- copy the input cards and other files
file(GLOB input_cards RELATIVE ${PROJECT_SOURCE_DIR} cards/*)
foreach(_files ${input_cards})
configure_file(
${_files}
${_files}
COPYONLY
)
endforeach()
file(GLOB readme RELATIVE ${PROJECT_SOURCE_DIR} README)
configure_file(${readme} ${readme} COPYONLY)
#----- set the tests directory
add_subdirectory(test)
add_subdirectory(utils)

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 5:59 PM (1 d, 17 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3805473
Default Alt Text
(3 KB)

Event Timeline