Changeset 19990 for trunk/Mars


Ignore:
Timestamp:
09/04/20 18:33:22 (4 years ago)
Author:
tbretz
Message:
Option -p is deprecated in newer root versions but required in older versions. The no-cast-align is still required in 6.23 to suppress stupid warnings introduced by root.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/CMakeLists.txt

    r19877 r19990  
    216216SET(ROOTVER ${ROOT_VERSION} CACHE INTERNAL "Internal variable to check for consistency of root version")
    217217
     218IF(ROOT_VERSION VERSION_LESS 6.20)
     219  SET(ROOT_DICTIONARY_OPTION -p)
     220ENDIF()
     221
     222
     223
    218224# -lGui -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree
    219225# -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread
     
    268274#      ^~~~~~~~~~~~~~~
    269275
    270 IF(NOT ROOT_VERSION VERSION_LESS 6.18 AND ROOT_VERSION VERSION_LESS 6.19)
     276IF(NOT ROOT_VERSION VERSION_LESS 6.18 AND ROOT_VERSION VERSION_LESS 6.23)
    271277   SET(CMAKE_CXX_FLAGS
    272278       "${CMAKE_CXX_FLAGS} -Wno-cast-align")
     
    310316
    311317        # - This adds the rule how the dictionary is created
    312         ROOT_GENERATE_DICTIONARY(dictionary/${_CINT} ${_HEADERS} ${_CINT}Incl.h LINKDEF ${subdir}/${_CINT}LinkDef.h OPTIONS -p -D__MARS__ -DHAVE_ZLIB)
     318        ROOT_GENERATE_DICTIONARY(dictionary/${_CINT} ${_HEADERS} ${_CINT}Incl.h LINKDEF ${subdir}/${_CINT}LinkDef.h OPTIONS ${ROOT_DICTIONARY_OPTION} -D__MARS__ -DHAVE_ZLIB)
    313319        # - This makes sure that it is compiled
    314320        TARGET_SOURCES(mars PRIVATE dictionary/${_CINT}.cxx ${_SRCLIST})
Note: See TracChangeset for help on using the changeset viewer.