Changeset fbad4c7 in git for CMakeLists.txt

Timestamp:

May 24, 2018, 9:12:31 PM (6 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4689481

Parents:

4fd4f01 (diff), 792092a (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.

Message:

Merge branch 'master' into photonId

Conflicts:

cards/CMS_PhaseII/CMS_PhaseII_200PU_v03.tcl

File:

• CMakeLists.txt (modified) (3 diffs)

CMakeLists.txt

@@ -26 +26 @@
 ENDIF(SET_RPATH)
     
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+
 # 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)
+  include_directories(${PYTHIA8_INCLUDE_DIRS})
+endif(PYTHIA8_FOUND)
 
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -41 +49 @@
   endif()
 endfunction()
+
+
 
 # Declare position of all other externals needed
@@ -77 +87 @@
 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 ${PYTHIA8_LIBRARIES} ${CMAKE_DL_LIBS})
+endif(PYTHIA8_FOUND)
+
 
 install(TARGETS Delphes DelphesDisplay DESTINATION lib)