Changeset 3283d6e in git

Timestamp:

Feb 5, 2018, 11:57:09 AM (7 years ago)

Author:

William Fawcett <william.fawcett@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

0a88f17

Parents:

8b8a46c

Message:

minor modification

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake/Modules/FindPythia8.cmake (modified) (1 diff)
• readers/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -41 +41 @@
 
 # WJF: Declare Pythia8 dependancy
-#include_directories($ENV{PYTHIA_INCLUDE_DIR})
-find_package(Pythia8)
-include_directories(${PYTHIA8_INCLUDE_DIRS})
-set(LIBS ${LIBS} ${PYTHIA8_LIBRARIES})
+if(PYTHIA8_FOUND)
+  find_package(Pythia8)
+  include_directories(${PYTHIA8_INCLUDE_DIRS})
+  set(LIBS ${LIBS} ${PYTHIA8_LIBRARIES})
+endif(PYTHIA8_FOUND)
 
-# WJF test
 
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -73 +73 @@
 add_subdirectory(readers)
 add_subdirectory(cards)
+add_subdirectory(analysis) # WJF: add for my analysis code 
 
 add_library(Delphes SHARED
@@ -97 +98 @@
 target_link_Libraries(Delphes ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
 target_link_Libraries(DelphesDisplay ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
-target_link_libraries(Delphes ${LIBS})
+if(PYTHIA8_FOUND)
+  target_link_libraries(Delphes ${LIBS}) #WJF: add (needed for DelphesPythia8)
+endif(PYTHIA8_FOUND)
 
 

cmake/Modules/FindPythia8.cmake

@@ -10 +10 @@
 
 set(_pythia8dirs
+    ${PYTHIA8}
+    $ENV{PYTHIA8}
     ${PYTHIA8_DIR}
     $ENV{PYTHIA8_DIR}

readers/CMakeLists.txt

@@ -9 +9 @@
 list(REMOVE_ITEM executables DelphesCMSFWLite.cpp)
 list(REMOVE_ITEM executables DelphesProMC.cpp)
-#list(REMOVE_ITEM executables DelphesPythia8.cpp)
+if(NOT PYTHIA8_FOUND)
+  list(REMOVE_ITEM executables DelphesPythia8.cpp)
+endif()
 
 # build all executables and put them into bin/