Changeset 3cfe61d in git

Timestamp:

Apr 7, 2021, 5:47:25 PM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

64294db, 82db145

Parents:

cd7aa16 (diff), 0feae05 (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:

Michele Selvaggi <michele.selvaggi@…> (04/07/21 17:47:25)

git-committer:

GitHub <noreply@…> (04/07/21 17:47:25)

Message:

Merge pull request #93 from vvolkl/rdev-fix-relocation2

Rdev fix relocation

Files:

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

classes/CMakeLists.txt

@@ -9 +9 @@
 list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/ClassesLinkDef.h)
 
-DELPHES_GENERATE_DICTIONARY(ClassesDict 
+# the macro invocation for ROOT6 ensures that the headers are relocatable
+if (NOT ${ROOT_VERSION} VERSION_LESS "6.0.0")
+  DELPHES_GENERATE_DICTIONARY(ClassesDict 
+    classes/DelphesModule.h
+    classes/DelphesFactory.h
+    classes/SortableObject.h
+    classes/DelphesClasses.h
+    LINKDEF ClassesLinkDef.h
+  )
+else()
+  # for ROOT5 the above fails, keep the following as workaround
+  DELPHES_GENERATE_DICTIONARY(ClassesDict
   ${CMAKE_CURRENT_SOURCE_DIR}/DelphesModule.h
   ${CMAKE_CURRENT_SOURCE_DIR}/DelphesFactory.h
   ${CMAKE_CURRENT_SOURCE_DIR}/SortableObject.h
   ${CMAKE_CURRENT_SOURCE_DIR}/DelphesClasses.h
-  LINKDEF ClassesLinkDef.h
-)
+    LINKDEF ClassesLinkDef.h
+  )
+endif()
 
 add_library(classes OBJECT ${sources} ClassesDict.cxx)

external/ExRootAnalysis/CMakeLists.txt

@@ -6 +6 @@
 file(GLOB sources *.cc)
 file(GLOB headers *.h)
+
 list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/ExRootAnalysisLinkDef.h)
 
-DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF 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()
 
 add_library(ExRootAnalysis OBJECT ${sources} ExRootAnalysisDict.cxx)