Changes in external/ExRootAnalysis/CMakeLists.txt [0feae05:82cf9c4] in git

File:

• external/ExRootAnalysis/CMakeLists.txt (modified) (1 diff)

external/ExRootAnalysis/CMakeLists.txt

@@ -6 +6 @@
 file(GLOB sources *.cc)
 file(GLOB headers *.h)
-
 list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/ExRootAnalysisLinkDef.h)
 
-# the macro invocation for ROOT6 ensures that the headers are relocatable
-if (NOT ${ROOT_VERSION} VERSION_LESS "6.0.0")
-  DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict
-    ExRootAnalysis/ExRootClassifier.h
-    ExRootAnalysis/ExRootConfReader.h
-    ExRootAnalysis/ExRootFilter.h
-    ExRootAnalysis/ExRootProgressBar.h
-    ExRootAnalysis/ExRootResult.h
-    ExRootAnalysis/ExRootTask.h
-    ExRootAnalysis/ExRootTreeBranch.h
-    ExRootAnalysis/ExRootTreeReader.h
-    ExRootAnalysis/ExRootTreeWriter.h
-    ExRootAnalysis/ExRootUtilities.h
-    LINKDEF ExRootAnalysisLinkDef.h)
-else()
-  # for ROOT5 the above fails, keep the following as workaround
-  DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF ExRootAnalysisLinkDef.h)
-endif()
+DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF ExRootAnalysisLinkDef.h)
 
 add_library(ExRootAnalysis OBJECT ${sources} ExRootAnalysisDict.cxx)
 
-# install headers
-install(FILES ${headers} DESTINATION include/ExRootAnalysis)
+# install headers needed by public Delphes headers to include/
+install(FILES ExRootTask.h ExRootConfReader.h ExRootTreeWriter.h ExRootTreeBranch.h
+        DESTINATION include/ExRootAnalysis)
+
+# install all LinkDef files into the same folder to ease user environment
+install(FILES ExRootAnalysisLinkDef.h DESTINATION include)
 
 # install pcms if they are created