Changeset be6c1c8 in git

Timestamp:

Aug 23, 2014, 8:25:53 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

5b5a56b

Parents:

9ca0c9c

Message:

adapt CMake files to ROOT 6

Files:

• CMakeLists.txt (modified) (1 diff)
• classes/CMakeLists.txt (modified) (1 diff)
• display/CMakeLists.txt (modified) (1 diff)
• external/ExRootAnalysis/CMakeLists.txt (modified) (1 diff)
• modules/CMakeLists.txt (modified) (1 diff)
• readers/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -9 +9 @@
 find_package(ROOT COMPONENTS EG Eve GenVector Hist Physics Matrix Graf RIO Tree Gpad RGL MathCore)
 include(${ROOT_USE_FILE})
+
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+  set(CMAKE_INSTALL_LIBDIR "lib")
+endif()
+
+function(DELPHES_GENERATE_DICTIONARY dictionary)
+  if(${ROOT_VERSION} LESS 6.0)
+    ROOT_GENERATE_DICTIONARY(${dictionary} ${ARGN})
+  else()
+    ROOT_GENERATE_DICTIONARY(${dictionary} MODULE ${dictionary} ${ARGN})
+  endif()
+endfunction()
 
 # Declare position of all other externals needed

classes/CMakeLists.txt

@@ -9 +9 @@
 list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/ClassesLinkDef.h)
 
-ROOT_GENERATE_DICTIONARY(ClassesDict 
+DELPHES_GENERATE_DICTIONARY(ClassesDict 
   ${CMAKE_CURRENT_SOURCE_DIR}/DelphesModule.h
   ${CMAKE_CURRENT_SOURCE_DIR}/DelphesFactory.h

display/CMakeLists.txt

@@ -9 +9 @@
 list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/DisplayLinkDef.h)
 
-ROOT_GENERATE_DICTIONARY(DisplayDict ${headers} LINKDEF DisplayLinkDef.h)
+DELPHES_GENERATE_DICTIONARY(DisplayDict ${headers} LINKDEF DisplayLinkDef.h)
 
 add_library(display OBJECT ${sources} DisplayDict.cxx)

external/ExRootAnalysis/CMakeLists.txt

@@ -8 +8 @@
 list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/ExRootAnalysisLinkDef.h)
 
-ROOT_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF ExRootAnalysisLinkDef.h)
+DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF ExRootAnalysisLinkDef.h)
 
 add_library(ExRootAnalysis OBJECT ${sources} ExRootAnalysisDict.cxx)

modules/CMakeLists.txt

@@ -10 +10 @@
 list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/Pythia8LinkDef.h)
 
-ROOT_GENERATE_DICTIONARY(ModulesDict ${headers} LINKDEF ModulesLinkDef.h)
+DELPHES_GENERATE_DICTIONARY(ModulesDict ${headers} LINKDEF ModulesLinkDef.h)
 
 # TODO: implement switch to enable Pythia8 if present

readers/CMakeLists.txt

@@ -6 +6 @@
 file(GLOB executables RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
 
-# TODO: implement switch to enable Pythia8 if present
-list(REMOVE_ITEM executables ${CMAKE_CURRENT_SOURCE_DIR}/DelphesPythia8.cpp)
+# TODO: implement switch to enable CMSSW, ProMC and Pythia8 if present
+list(REMOVE_ITEM executables DelphesCMSFWLite.cpp)
+list(REMOVE_ITEM executables DelphesProMC.cpp)
+list(REMOVE_ITEM executables DelphesPythia8.cpp)
 
 # build all executables and put them into bin/