Changeset 8b8a46c in git

Timestamp:

Feb 5, 2018, 11:56:37 AM (7 years ago)

Author:

William Fawcett <william.fawcett@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

3283d6e

Parents:

44dbbc1

Message:

start introducing pythia8 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)
     
+# WJF: add path to place where Find*.cmake files can be found (for external libraries)
+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})
+
+# WJF: Declare TrickTrack dependency
+find_package(tricktrack)
+include_directories(${tricktrack_INCLUDE_DIR})
+
+# WJF: Declare Eigen dependency 
+include_directories($ENV{EIGEN_INCLUDE_DIR})
+
+# WJF: Declare Pythia8 dependancy
+#include_directories($ENV{PYTHIA_INCLUDE_DIR})
+find_package(Pythia8)
+include_directories(${PYTHIA8_INCLUDE_DIRS})
+set(LIBS ${LIBS} ${PYTHIA8_LIBRARIES})
+
+# WJF test
 
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -41 +59 @@
   endif()
 endfunction()
+
+
 
 # Declare position of all other externals needed
@@ -77 +97 @@
 target_link_Libraries(Delphes ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
 target_link_Libraries(DelphesDisplay ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
+target_link_libraries(Delphes ${LIBS})
+
 
 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)
+#list(REMOVE_ITEM executables DelphesPythia8.cpp)
 
 # build all executables and put them into bin/