Changeset 19990 for trunk/Mars
- Timestamp:
- 09/04/20 18:33:22 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars/CMakeLists.txt
r19877 r19990 216 216 SET(ROOTVER ${ROOT_VERSION} CACHE INTERNAL "Internal variable to check for consistency of root version") 217 217 218 IF(ROOT_VERSION VERSION_LESS 6.20) 219 SET(ROOT_DICTIONARY_OPTION -p) 220 ENDIF() 221 222 223 218 224 # -lGui -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree 219 225 # -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread … … 268 274 # ^~~~~~~~~~~~~~~ 269 275 270 IF(NOT ROOT_VERSION VERSION_LESS 6.18 AND ROOT_VERSION VERSION_LESS 6. 19)276 IF(NOT ROOT_VERSION VERSION_LESS 6.18 AND ROOT_VERSION VERSION_LESS 6.23) 271 277 SET(CMAKE_CXX_FLAGS 272 278 "${CMAKE_CXX_FLAGS} -Wno-cast-align") … … 310 316 311 317 # - 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) 313 319 # - This makes sure that it is compiled 314 320 TARGET_SOURCES(mars PRIVATE dictionary/${_CINT}.cxx ${_SRCLIST})
Note:
See TracChangeset
for help on using the changeset viewer.