Fork me on GitHub

Changeset 3b3071a in git for classes/CMakeLists.txt


Ignore:
Timestamp:
Apr 17, 2021, 10:28:12 AM (4 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
master
Children:
27197df
Parents:
9e08f27 (diff), 64294db (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.
Message:

Merge branch 'master' of https://github.com/delphes/delphes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • classes/CMakeLists.txt

    r9e08f27 r3b3071a  
    99list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/ClassesLinkDef.h)
    1010
    11 DELPHES_GENERATE_DICTIONARY(ClassesDict
     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(ClassesDict
     14    classes/DelphesModule.h
     15    classes/DelphesFactory.h
     16    classes/SortableObject.h
     17    classes/DelphesClasses.h
     18    LINKDEF ClassesLinkDef.h
     19  )
     20else()
     21  # for ROOT5 the above fails, keep the following as workaround
     22  DELPHES_GENERATE_DICTIONARY(ClassesDict
    1223  ${CMAKE_CURRENT_SOURCE_DIR}/DelphesModule.h
    1324  ${CMAKE_CURRENT_SOURCE_DIR}/DelphesFactory.h
    1425  ${CMAKE_CURRENT_SOURCE_DIR}/SortableObject.h
    1526  ${CMAKE_CURRENT_SOURCE_DIR}/DelphesClasses.h
    16   LINKDEF ClassesLinkDef.h
    17 )
     27    LINKDEF ClassesLinkDef.h
     28  )
     29endif()
    1830
    1931add_library(classes OBJECT ${sources} ClassesDict.cxx)
Note: See TracChangeset for help on using the changeset viewer.