Page MenuHomeHEPForge
Files F19251556

No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/CepGen/StructureFunctions/CMakeLists.txt b/CepGen/StructureFunctions/CMakeLists.txt
index 3365d68..6778e95 100644
--- a/CepGen/StructureFunctions/CMakeLists.txt
+++ b/CepGen/StructureFunctions/CMakeLists.txt
@@ -1,18 +1,25 @@
file(GLOB sf_sources *.cpp)
+set(sources ${sf_sources})
include_directories(${PROJECT_SOURCE_DIR})
-#----- build the object
-
-add_library(CepGenStructureFunctions SHARED ${sf_sources})
-
#----- check the external dependencies
-if(EXISTS $ENV{has_grv})
- add_library(GRV_PDF SHARED $ENV{has_grv})
- target_link_libraries(CepGenStructureFunctions GRV_PDF)
+set(GRV_PATH ${PROJECT_SOURCE_DIR}/External)
+file(GLOB grv_sources ${GRV_PATH}/grv_*.f)
+if(grv_sources)
+ message(STATUS "GRV PDFset found in ${grv_sources}!")
+ list(APPEND sources ${grv_sources})
+else()
+ message(STATUS "GRV PDFset not found. Will proceed without it")
endif()
+#----- build the object
+
+add_library(CepGenStructureFunctions SHARED ${sources})
+target_link_libraries(CepGenStructureFunctions ${external_deps})
+
+#----- installation rules
+
install(TARGETS CepGenStructureFunctions DESTINATION lib)
-install(TARGETS GRV_PDF DESTINATION lib)
diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt
index 1d5d075..acaceb9 100644
--- a/External/CMakeLists.txt
+++ b/External/CMakeLists.txt
@@ -1,31 +1,24 @@
file(GLOB has_pythia6 pythia6*.f)
if(EXISTS ${has_pythia6})
set(ENV{has_pythia6} ${has_pythia6})
message(STATUS "Pythia6 found in ${has_pythia6}!")
else()
message(STATUS "Pythia6 not found. Will proceed without it")
endif()
file(GLOB has_herwig herwig_*.f)
if(EXISTS ${has_herwig})
set(ENV{has_herwig} ${has_herwig})
message(STATUS "Herwig6 found in ${has_herwig}!")
else()
message(STATUS "Herwig6 not found. Will proceed without it")
endif()
file(GLOB has_jetset jetset*.f)
if(EXISTS ${has_jetset})
set(ENV{has_jetset} ${has_jetset})
message(STATUS "Jetset7 found in ${has_jetset}!")
else()
message(STATUS "Jetset7 not found. Will proceed without it")
endif()
-file(GLOB has_grv grv_*.f)
-if(EXISTS ${has_grv})
- set(ENV{has_grv} ${has_grv})
- message(STATUS "GRV PDFset found in ${has_grv}!")
-else()
- message(STATUS "GRV PDFset not found. Will proceed without it")
-endif()

File Metadata

Mime Type
text/x-diff
Expires
Tue, Sep 30, 6:06 AM (1 d, 19 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6566424
Default Alt Text
(2 KB)

Event Timeline

HEPForge.org · .