# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1479674743 -3600
# Node ID 2f2de941dff78956922668122ae79b3e3024855b
# Parent  cfaf2bea096eccbac21ec61303028f92f7b59f8a# Parent  728403a6ec1fb6610befa48c4146d7542c2e76a9
fix

diff -r cfaf2bea096e -r 2f2de941dff7 CMakeLists.txt
--- a/CMakeLists.txt	Sun Nov 20 21:45:24 2016 +0100
+++ b/CMakeLists.txt	Sun Nov 20 21:45:43 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 cfaf2bea096e -r 2f2de941dff7 OrthancServer/main.cpp
--- a/OrthancServer/main.cpp	Sun Nov 20 21:45:24 2016 +0100
+++ b/OrthancServer/main.cpp	Sun Nov 20 21:45:43 2016 +0100
@@ -914,7 +914,7 @@
   catch (OrthancException&)
   {
     LOG(ERROR) << "Unable to run the automated upgrade, please use the replication instructions: "
-               << "https://orthanc.chu.ulg.ac.be/book/users/replication.html";
+               << "http://book.orthanc-server.com//users/replication.html";
     throw;
   }
     
diff -r cfaf2bea096e -r 2f2de941dff7 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Sun Nov 20 21:45:24 2016 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Sun Nov 20 21:45:43 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()
 
 
diff -r cfaf2bea096e -r 2f2de941dff7 Resources/OrthancPlugin.doxygen
--- a/Resources/OrthancPlugin.doxygen	Sun Nov 20 21:45:24 2016 +0100
+++ b/Resources/OrthancPlugin.doxygen	Sun Nov 20 21:45:43 2016 +0100
@@ -32,7 +32,7 @@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         =
+PROJECT_NUMBER         = @ORTHANC_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer