Mercurial > hg > orthanc

comparison CMakeLists.txt @ 2338:86a99fd1bbfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch to just-released dcmtk 3.6.2
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 17 Jul 2017 18:49:45 +0200
parents 423d3b692bb9
children 6e26d363dc53
comparison
equal deleted inserted replaced
2337:ad6b669ca08c 2338:86a99fd1bbfb
51 SET(USE_SYSTEM_PUGIXML ON CACHE BOOL "Use the system version of Pugixml") 51 SET(USE_SYSTEM_PUGIXML ON CACHE BOOL "Use the system version of Pugixml")
52 SET(USE_SYSTEM_LIBP11 OFF CACHE BOOL "Use the system version of libp11 (PKCS#11 wrapper library)") 52 SET(USE_SYSTEM_LIBP11 OFF CACHE BOOL "Use the system version of libp11 (PKCS#11 wrapper library)")
53 53
54 # Advanced parameters 54 # Advanced parameters
55 SET(USE_PUGIXML ON CACHE BOOL "Use the Pugixml parser (turn off only for debug)") 55 SET(USE_PUGIXML ON CACHE BOOL "Use the Pugixml parser (turn off only for debug)")
56 SET(USE_DCMTK_361 OFF CACHE BOOL "Use forthcoming DCMTK version 3.6.1 in static builds (instead of 3.6.0)") 56 SET(USE_DCMTK_360 OFF CACHE BOOL "Use older DCMTK version 3.6.0 in static builds (instead of default 3.6.2)")
57 SET(USE_DCMTK_361_PRIVATE_DIC ON CACHE BOOL "Use the dictionary of private tags from DCMTK 3.6.1 in static builds (which is more up-to-date)")
58 57
59 # Distribution-specific settings 58 # Distribution-specific settings
60 SET(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") 59 SET(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
61 SET(SYSTEM_MONGOOSE_USE_CALLBACKS ON CACHE BOOL "The system version of Mongoose uses callbacks (version >= 3.7)") 60 SET(SYSTEM_MONGOOSE_USE_CALLBACKS ON CACHE BOOL "The system version of Mongoose uses callbacks (version >= 3.7)")
62 SET(USE_BOOST_ICONV ON CACHE BOOL "Use iconv instead of wconv (Windows only)") 61 SET(USE_BOOST_ICONV ON CACHE BOOL "Use iconv instead of wconv (Windows only)")
266 ) 265 )
267 266
268 267
269 if (CMAKE_COMPILER_IS_GNUCXX 268 if (CMAKE_COMPILER_IS_GNUCXX
270 AND NOT CMAKE_CROSSCOMPILING 269 AND NOT CMAKE_CROSSCOMPILING
271 AND NOT USE_DCMTK_361) 270 AND USE_DCMTK_360)
272 # Add the "-pedantic" flag only on the Orthanc sources, and only if 271 # Add the "-pedantic" flag only on the Orthanc sources, and only if
273 # using DCMTK 3.6.0 272 # using DCMTK 3.6.0
274 set_source_files_properties(${ORTHANC_ALL_SOURCES} 273 set_source_files_properties(${ORTHANC_ALL_SOURCES}
275 PROPERTIES COMPILE_FLAGS -pedantic 274 PROPERTIES COMPILE_FLAGS -pedantic
276 ) 275 )