# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1479393550 -3600
# Node ID f75611abd407a0655b1ccf29b631e19424d7bcae
# Parent  86089e7776917676e0585923198b1922f77d7a98
cmake option USE_DCMTK_361_PRIVATE_DIC

diff -r 86089e777691 -r f75611abd407 CMakeLists.txt
--- a/CMakeLists.txt	Thu Nov 17 09:28:33 2016 +0100
+++ b/CMakeLists.txt	Thu Nov 17 15:39:10 2016 +0100
@@ -32,7 +32,6 @@
 SET(BUILD_SERVE_FOLDERS ON CACHE BOOL "Whether to build the ServeFolders plugin")
 SET(BUILD_MODALITY_WORKLISTS ON CACHE BOOL "Whether to build the sample plugin to serve modality worklists")
 SET(BUILD_RECOVER_COMPRESSED_FILE ON CACHE BOOL "Whether to build the companion tool to recover files compressed using Orthanc")
-SET(USE_DCMTK_361 OFF CACHE BOOL "Use forthcoming DCMTK version 3.6.1 in static builds (instead of 3.6.0)")
 SET(ENABLE_PKCS11 OFF CACHE BOOL "Enable PKCS#11 for HTTPS client authentication using hardware security modules and smart cards")
 
 # Advanced parameters to fine-tune linking against system libraries
@@ -51,8 +50,10 @@
 SET(USE_SYSTEM_PUGIXML ON CACHE BOOL "Use the system version of Pugixml")
 SET(USE_SYSTEM_LIBP11 OFF CACHE BOOL "Use the system version of libp11 (PKCS#11 wrapper library)")
 
-# Experimental options
+# Advanced parameters
 SET(USE_PUGIXML ON CACHE BOOL "Use the Pugixml parser (turn off only for debug)")
+SET(USE_DCMTK_361 OFF CACHE BOOL "Use forthcoming DCMTK version 3.6.1 in static builds (instead of 3.6.0)")
+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)")
 
 # Distribution-specific settings
 SET(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
diff -r 86089e777691 -r f75611abd407 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Thu Nov 17 09:28:33 2016 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Thu Nov 17 15:39:10 2016 +0100
@@ -36,15 +36,20 @@
   DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
 
   
-  if (FirstRun AND NOT USE_DCMTK_361)
-    # If using DCMTK 3.6.0, backport the "private.dic" file from DCMTK
-    # 3.6.1 snapshot. This adds support for more private tags, and
-    # fixes some import problems with Philips MRI Achieva.
-    message("Using the dictionary of private tags from DCMTK 3.6.1")
-    configure_file(
-      ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.1-private.dic
-      ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
-      COPYONLY)
+  if (FirstRun AND
+      NOT USE_DCMTK_361)
+    if (USE_DCMTK_361_PRIVATE_DIC)
+      # If using DCMTK 3.6.0, backport the "private.dic" file from DCMTK
+      # 3.6.1 snapshot. This adds support for more private tags, and
+      # fixes some import problems with Philips MRI Achieva.
+      message("Using the dictionary of private tags from DCMTK 3.6.1")
+      configure_file(
+        ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.1-private.dic
+        ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
+        COPYONLY)
+    else()
+      message("Using the dictionary of private tags from DCMTK 3.6.0")
+    endif()
   endif()