changeset 6569:a96b627e2723

reverted changeset a1be792caa93
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 27 Jan 2026 12:06:49 +0100
parents bb56a9cccf75
children 43ff4470024d dfb5748c8209
files INSTALL NEWS OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
diffstat 3 files changed, 10 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL	Tue Jan 20 09:19:56 2026 +0100
+++ b/INSTALL	Tue Jan 27 12:06:49 2026 +0100
@@ -76,7 +76,8 @@
 
 # cd [...]\Orthanc\Build
 # cmake -DSTANDALONE_BUILD=ON -DSTATIC_BUILD=ON -DALLOW_DOWNLOADS=ON \
-  -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_BOOST=ON -G "Visual Studio 9 2008" [...]\OrthancServer
+  -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_BOOST=ON -DDCMTK_STATIC_VERSION=3.6.9 \
+  -G "Visual Studio 9 2008" [...]\OrthancServer
 
 Then open the "[...]\Orthanc\Build\Orthanc.sln" with Visual Studio.
 
--- a/NEWS	Tue Jan 20 09:19:56 2026 +0100
+++ b/NEWS	Tue Jan 27 12:06:49 2026 +0100
@@ -36,7 +36,13 @@
   
 
 NB: To maintain compatibility with Windows XP, which is not supported
-by DCMTK 3.7.0, Windows 32-bit builds still use DCMTK 3.6.9.
+by DCMTK 3.7.0, Windows 32-bit builds must use
+"-DDCMTK_STATIC_VERSION=3.6.9" during the invocation of CMake. This is
+because the citrus library of DCMTK makes use of SRWLOCK and
+associated functions such as AcquireSRWLockShared(), which were only
+introduced in Windows Vista and Windows Server 2008.
+
+
 
 
 Version 1.12.10 (2025-11-26)
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Jan 20 09:19:56 2026 +0100
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Jan 27 12:06:49 2026 +0100
@@ -77,21 +77,8 @@
 set(USE_SYSTEM_UUID ON CACHE BOOL "Use the system version of the uuid library from e2fsprogs")
 set(USE_SYSTEM_ZLIB ON CACHE BOOL "Use the system version of ZLib")
 
-# Parameters specific to DCMTK
-if (WIN32 AND
-    CMAKE_SIZEOF_VOID_P EQUAL 4)
-  # This is because the citrus library of DCMTK makes use of SRWLOCK
-  # and associated functions such as AcquireSRWLockShared(), which
-  # were only introduced in Windows Vista and Windows Server 2008. The
-  # Orthanc project wants to preserve compatibility with Windows XP.
-  message(STATUS "As you are targeting Windows 32bit, the default version of DCMTK is 3.6.9")
-  set(DCMTK_STATIC_VERSION_DEFAULT "3.6.9")
-else()
-  set(DCMTK_STATIC_VERSION_DEFAULT "3.7.0")
-endif()
-
 set(DCMTK_DICTIONARY_DIR "" CACHE PATH "Directory containing the DCMTK dictionaries \"dicom.dic\" and \"private.dic\" (only when using system version of DCMTK)")
-set(DCMTK_STATIC_VERSION "${DCMTK_STATIC_VERSION_DEFAULT}" CACHE STRING "Version of DCMTK to be used in static builds (can be \"3.6.0\", \"3.6.2\", \"3.6.4\", \"3.6.5\", \"3.6.6\", \"3.6.7\", \"3.6.8\", \"3.6.9\", or \"3.7.0\")")
+set(DCMTK_STATIC_VERSION "3.7.0" CACHE STRING "Version of DCMTK to be used in static builds (can be \"3.6.0\", \"3.6.2\", \"3.6.4\", \"3.6.5\", \"3.6.6\", \"3.6.7\", \"3.6.8\", \"3.6.9\", or \"3.7.0\")")
 set(USE_DCMTK_362_PRIVATE_DIC ON CACHE BOOL "Use the dictionary of private tags from DCMTK 3.6.2 if using DCMTK 3.6.0")
 set(USE_SYSTEM_DCMTK ON CACHE BOOL "Use the system version of DCMTK")
 set(ENABLE_DCMTK_LOG ON CACHE BOOL "Enable logging internal to DCMTK")