Changeset 90187bd in git

Timestamp:

May 18, 2018, 8:33:39 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

b315535

Parents:

73bc3ca (diff), 4ed4118 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Pavel Demin <pavel-demin@…> (05/18/18 20:33:39)

git-committer:

GitHub <noreply@…> (05/18/18 20:33:39)

Message:

Merge pull request #47 from will-fawcett/cmake-pythia8

Add pythia8 dependancy to CMake

Files:

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

CMakeLists.txt

@@ -26 +26 @@
 ENDIF(SET_RPATH)
     
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
 # Declare ROOT dependency
 find_package(ROOT COMPONENTS EG Eve Geom Gui GuiHtml GenVector Hist Physics Matrix Graf RIO Tree Gpad RGL MathCore)
 include(${ROOT_USE_FILE})
+
+
+# Declare Pythia8 dependancy
+find_package(Pythia8)
+if(PYTHIA8_FOUND)
+  message(STATUS "Pythia8 found")
+  include_directories(${PYTHIA8_INCLUDE_DIRS})
+  set(LIBS ${LIBS} ${PYTHIA8_LIBRARIES})
+endif(PYTHIA8_FOUND)
+
 
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -41 +53 @@
   endif()
 endfunction()
+
+
 
 # Declare position of all other externals needed
@@ -77 +91 @@
 target_link_Libraries(Delphes ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
 target_link_Libraries(DelphesDisplay ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
+if(PYTHIA8_FOUND)
+  target_link_libraries(Delphes ${LIBS}) # needed for DelphesPythia8
+endif(PYTHIA8_FOUND)
+
 
 install(TARGETS Delphes DelphesDisplay DESTINATION lib)

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/