Changeset 19990 for trunk

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:

• trunk/Mars/CMakeLists.txt (modified) (3 diffs)

trunk/Mars/CMakeLists.txt

@@ -216 +216 @@
 SET(ROOTVER ${ROOT_VERSION} CACHE INTERNAL "Internal variable to check for consistency of root version")
 
+IF(ROOT_VERSION VERSION_LESS 6.20)
+  SET(ROOT_DICTIONARY_OPTION -p)
+ENDIF()
+
+
+
 # -lGui -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree
 # -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread
@@ -268 +274 @@
 #      ^~~~~~~~~~~~~~~
 
-IF(NOT ROOT_VERSION VERSION_LESS 6.18 AND ROOT_VERSION VERSION_LESS 6.19)
+IF(NOT ROOT_VERSION VERSION_LESS 6.18 AND ROOT_VERSION VERSION_LESS 6.23)
    SET(CMAKE_CXX_FLAGS
        "${CMAKE_CXX_FLAGS} -Wno-cast-align")
@@ -310 +316 @@
 
         # - This adds the rule how the dictionary is created
-        ROOT_GENERATE_DICTIONARY(dictionary/${_CINT} ${_HEADERS} ${_CINT}Incl.h LINKDEF ${subdir}/${_CINT}LinkDef.h OPTIONS -p  -D__MARS__ -DHAVE_ZLIB)
+        ROOT_GENERATE_DICTIONARY(dictionary/${_CINT} ${_HEADERS} ${_CINT}Incl.h LINKDEF ${subdir}/${_CINT}LinkDef.h OPTIONS ${ROOT_DICTIONARY_OPTION} -D__MARS__ -DHAVE_ZLIB)
         # - This makes sure that it is compiled
         TARGET_SOURCES(mars PRIVATE dictionary/${_CINT}.cxx ${_SRCLIST})