# HG changeset patch # User Sebastien Jodogne # Date 1550679699 -3600 # Node ID 5cd4c672d63c983261263105a49cfb29fb903494 # Parent 95b0536be2c37244e34d701f02ec0462b672b69f cont diff -r 95b0536be2c3 -r 5cd4c672d63c CMakeLists.txt --- a/CMakeLists.txt Wed Feb 20 17:19:27 2019 +0100 +++ b/CMakeLists.txt Wed Feb 20 17:21:39 2019 +0100 @@ -148,7 +148,7 @@ if (CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CROSSCOMPILING - AND USE_DCMTK_360) + AND DCMTK_STATIC_VERSION STREQUAL "3.6.0") # Add the "-pedantic" flag only on the Orthanc sources, and only if # cross-compiling DCMTK 3.6.0 set(ORTHANC_ALL_SOURCES diff -r 95b0536be2c3 -r 5cd4c672d63c INSTALL --- a/INSTALL Wed Feb 20 17:19:27 2019 +0100 +++ b/INSTALL Wed Feb 20 17:21:39 2019 +0100 @@ -157,6 +157,6 @@ -DCMAKE_TOOLCHAIN_FILE=~/Orthanc/Resources/MinGWToolchain.cmake \ -DSTANDALONE_BUILD=ON \ -DSTATIC_BUILD=ON \ - -DUSE_DCMTK_360=ON \ + -DDCMTK_STATIC_VERSION=3.6.0 \ -DUSE_LEGACY_JSONCPP=ON # make