Fork me on GitHub

Changeset 3cfe61d in git for external


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • external/ExRootAnalysis/CMakeLists.txt

    rcd7aa16 r3cfe61d  
    66file(GLOB sources *.cc)
    77file(GLOB headers *.h)
     8
    89list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/ExRootAnalysisLinkDef.h)
    910
    10 DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF ExRootAnalysisLinkDef.h)
     11# the macro invocation for ROOT6 ensures that the headers are relocatable
     12if (NOT ${ROOT_VERSION} VERSION_LESS "6.0.0")
     13  DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict
     14    ExRootAnalysis/ExRootClassifier.h
     15    ExRootAnalysis/ExRootConfReader.h
     16    ExRootAnalysis/ExRootFilter.h
     17    ExRootAnalysis/ExRootProgressBar.h
     18    ExRootAnalysis/ExRootResult.h
     19    ExRootAnalysis/ExRootTask.h
     20    ExRootAnalysis/ExRootTreeBranch.h
     21    ExRootAnalysis/ExRootTreeReader.h
     22    ExRootAnalysis/ExRootTreeWriter.h
     23    ExRootAnalysis/ExRootUtilities.h
     24    LINKDEF ExRootAnalysisLinkDef.h)
     25else()
     26  # for ROOT5 the above fails, keep the following as workaround
     27  DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF ExRootAnalysisLinkDef.h)
     28endif()
    1129
    1230add_library(ExRootAnalysis OBJECT ${sources} ExRootAnalysisDict.cxx)
Note: See TracChangeset for help on using the changeset viewer.