Changeset ba88abf in git

Timestamp:

Oct 26, 2020, 3:19:28 PM (4 years ago)

Author:

GitHub <noreply@…>

Children:

1a35f96

Parents:

80763ac (diff), b8a84d7 (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:

Roberto Preghenella <preghenella@…> (10/26/20 15:19:28)

git-committer:

GitHub <noreply@…> (10/26/20 15:19:28)

Message:

Merge pull request #2 from preghenella/rdev-fix-relocation

Fix relocation issues with header files in dictionary

Files:

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

classes/CMakeLists.txt

@@ -10 +10 @@
 
 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
+  classes/DelphesModule.h
+  classes/DelphesFactory.h
+  classes/SortableObject.h
+  classes/DelphesClasses.h
   LINKDEF ClassesLinkDef.h
 )

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)
+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)
 
 add_library(ExRootAnalysis OBJECT ${sources} ExRootAnalysisDict.cxx)