Merge branch 'DCMTK:master' into master

.github/workflows/cmake-win.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Download DCMTK Support libraries
         shell: pwsh
         run: |
-          C:\msys64\usr\bin\wget.exe -O dcmtk_support.zip https://dicom.offis.de/download/dcmtk/dcmtk368/support/dcmtk-3.6.8-win64-support-MD-msvc-17.4.zip
+          C:\msys64\usr\bin\wget.exe -O dcmtk_support.zip https://dicom.offis.de/download/dcmtk/dcmtk369/support/dcmtk-3.6.9-win64-support-MD-msvc-17.8.zip
 
       # Uncompress support libraries into directory c:\dcmtk_support\libs.
       # We rename the original directory to libs so that the rest of the script
@@ -60,7 +60,7 @@ jobs:
           echo "Step 2"
           cd ${{ github.workspace }}\dcmtk-build
           echo "Step 3"
-          cmake -G "Visual Studio 17 2022" -Ax64 -DDCMTK_MODULES:STR="ofstd;oflog;oficonv;dcmdata;dcmimgle;dcmimage;dcmjpeg;dcmjpls;dcmtls;dcmnet;dcmsr;dcmsign;dcmwlm;dcmqrdb;dcmpstat;dcmrt;dcmiod;dcmfg;dcmseg;dcmtract;dcmpmap;dcmect" -DDCMTK_ENABLE_BUILTIN_OFICONV_DATA:BOOL=On -DBUILD_SHARED_LIBS:BOOL=ON -DDCMTK_SUPPORT_LIBRARIES_DIR:PATH=c:\dcmtk_support\libs -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-${{ env.NOW }}-${{ env.COMMIT_SHORT_SHA }}  ${{ github.workspace }}
+          cmake -G "Visual Studio 17 2022" -Ax64 -DDCMTK_MODULES:STR="ofstd;oflog;oficonv;dcmdata;dcmimgle;dcmimage;dcmjpeg;dcmjpls;dcmtls;dcmnet;dcmsr;dcmsign;dcmwlm;dcmqrdb;dcmpstat;dcmrt;dcmiod;dcmfg;dcmseg;dcmtract;dcmpmap;dcmect;dcmapps" -DDCMTK_ENABLE_BUILTIN_OFICONV_DATA:BOOL=On -DBUILD_SHARED_LIBS:BOOL=ON -DDCMTK_SUPPORT_LIBRARIES_DIR:PATH=c:\dcmtk_support\libs -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-${{ env.NOW }}-${{ env.COMMIT_SHORT_SHA }}  ${{ github.workspace }}
 
       - name: Build dcmtk
         run: |

.gitignore

@@ -15,7 +15,7 @@ config/Makefile.def
 config/include/dcmtk/config/osconfig.h
 
 # Ignore files and directories created by Autoconf
-configure
+/configure
 config/autom4te.cache/
 
 # Ignore all temporary, log and backup files
@@ -37,6 +37,7 @@ doxygen/dcmtk.tag
 
 # Ignore built binary files
 */tests/tests
+dcmapps/apps/dcm2img
 dcmdata/apps/cda2dcm
 dcmdata/apps/dcm2cda
 dcmdata/apps/dcm2json

ANNOUNCE

@@ -8,7 +8,7 @@ ANNOUNCEMENT
 
 Version X.Y.Z of the OFFIS DCMTK (DICOM ToolKit) software is now available for
 public release.  This release includes the following main changes over the
-previous version 3.6.8:
+previous version 3.6.9:
 
   [...]
 
@@ -25,4 +25,4 @@ The DCMTK software can be downloaded via:
 
   https://dicom.offis.de/dcmtk or https://www.dcmtk.org/
 
-OFFIS e.V., Oldenburg, Germany, 2024-01-02
+OFFIS e.V., Oldenburg, Germany, 2024-12-13

CMake/3rdparty.cmake

@@ -248,7 +248,8 @@ else()
     if(WITH_LIBXMLINC)
       set(LIBXML_INCDIR "${WITH_LIBXMLINC}/include")
       set(LIBXML_LIBDIR "${WITH_LIBXMLINC}/lib")
-      set(LIBXML_LIBS debug "${LIBXML_LIBDIR}/libxml2_d.lib" optimized "${LIBXML_LIBDIR}/libxml2_o.lib")
+      # libxml2 2.13 and newer require bcrypt.lib on Windows.
+      set(LIBXML_LIBS bcrypt debug "${LIBXML_LIBDIR}/libxml2_d.lib" optimized "${LIBXML_LIBDIR}/libxml2_o.lib")
       if (EXISTS "${LIBXML_LIBDIR}/iconv_o.lib")
           set(LIBXML_LIBS ${LIBXML_LIBS} debug "${LIBXML_LIBDIR}/iconv_d.lib" optimized "${LIBXML_LIBDIR}/iconv_o.lib")
       endif()

CMake/DCMTKConfig.cmake.in

@@ -48,6 +48,7 @@ set(DCMTK_ENABLE_STL_SYSTEM_ERROR @DCMTK_ENABLE_STL_SYSTEM_ERROR@)
 set(DCMTK_ENABLE_STL_TUPLE @DCMTK_ENABLE_STL_TUPLE@)
 set(DCMTK_ENABLE_STL_TYPE_TRAITS @DCMTK_ENABLE_STL_TYPE_TRAITS@)
 set(DCMTK_ENABLE_STL_VECTOR @DCMTK_ENABLE_STL_VECTOR@)
+set(DCMTK_ENABLE_STL_ATOMIC @DCMTK_ENABLE_STL_ATOMIC@)
 
 set(DCMTK_FORCE_FPIC_ON_UNIX @DCMTK_FORCE_FPIC_ON_UNIX@)
 

CMake/GenerateDCMTKConfigure.cmake

@@ -200,8 +200,18 @@ else()
   set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
 
   # These variables are defined as macros in osconfig.h and must end with a path separator
-  set(DCMTK_DEFAULT_CONFIGURATION_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/")
-  set(DCMTK_DEFAULT_SUPPORT_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}/")
+  if(CMAKE_VERSION VERSION_LESS 3.20.0)
+    # CMake versions prior to 3.20 expect the third parameter to be passed in ${dir}
+    set(dir "SYSCONFDIR")
+    GNUInstallDirs_get_absolute_install_dir(DCMTK_DEFAULT_CONFIGURATION_DIR CMAKE_INSTALL_SYSCONFDIR)
+    set(dir "BINDIR")
+    GNUInstallDirs_get_absolute_install_dir(DCMTK_DEFAULT_SUPPORT_DATA_DIR CMAKE_INSTALL_DATADIR)
+  else()
+    GNUInstallDirs_get_absolute_install_dir(DCMTK_DEFAULT_CONFIGURATION_DIR CMAKE_INSTALL_SYSCONFDIR SYSCONFDIR)
+    GNUInstallDirs_get_absolute_install_dir(DCMTK_DEFAULT_SUPPORT_DATA_DIR CMAKE_INSTALL_DATADIR BINDIR)
+  endif()
+  set(DCMTK_DEFAULT_CONFIGURATION_DIR "${DCMTK_DEFAULT_CONFIGURATION_DIR}/")
+  set(DCMTK_DEFAULT_SUPPORT_DATA_DIR "${DCMTK_DEFAULT_SUPPORT_DATA_DIR}/")
 
   # Set dictionary path to the data dir inside install main dir (prefix).
   if(DCMTK_DEFAULT_DICT STREQUAL "external")
@@ -340,6 +350,7 @@ endif()
   CHECK_INCLUDE_FILE_CXX("system_error" HAVE_SYSTEM_ERROR)
   CHECK_INCLUDE_FILE_CXX("tuple" HAVE_TUPLE)
   CHECK_INCLUDE_FILE_CXX("type_traits" HAVE_TYPE_TRAITS)
+  CHECK_INCLUDE_FILE_CXX("atomic" HAVE_ATOMIC)
 
 if(NOT APPLE)
   # poll on macOS is unreliable, it first did not exist, then was broken until
@@ -503,9 +514,7 @@ endif()
     set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} iphlpapi ws2_32 netapi32 wsock32)
   endif()
 
-  if(HAVE_FENV_H)
-    set(HEADERS ${HEADERS} fenv.h)
-  endif()
+  set(HEADERS ${HEADERS} fenv.h)
 
   # std::vsnprintf and std::vsnprintf need the C++ version of the headers.
   # We just assume they exist when the C version was found
@@ -529,6 +538,7 @@ endif()
   endif()
 
   CHECK_FUNCTION_EXISTS(_findfirst HAVE__FINDFIRST)
+  CHECK_FUNCTION_EXISTS(_set_output_format HAVE__SET_OUTPUT_FORMAT)
   CHECK_FUNCTION_EXISTS(access HAVE_ACCESS)
   CHECK_FUNCTION_EXISTS(atoll HAVE_ATOLL)
   CHECK_FUNCTION_EXISTS(bcmp HAVE_BCMP)
@@ -1332,6 +1342,7 @@ DCMTK_ENABLE_STL98_FEATURE("vector")
 DCMTK_ENABLE_STL11_FEATURE("type_traits")
 DCMTK_ENABLE_STL11_FEATURE("tuple")
 DCMTK_ENABLE_STL11_FEATURE("system_error")
+DCMTK_ENABLE_STL11_FEATURE("atomic")
 
 # if at least one modern C++ standard should be supported,
 # enforce setting of __cplusplus macro in VS 2017 and above

CMake/dcmtkMacros.cmake

@@ -54,6 +54,10 @@ macro(DCMTK_ADD_EXECUTABLE PROGRAM)
             set_target_properties(${PROGRAM} PROPERTIES LINK_FLAGS ${WIN32_STD_OBJECTS})
         endif()
 
+        if(CMAKE_DEBUG_POSTFIX AND USE_DEBUG_POSTFIX_FOR_EXEC)
+            set_property(TARGET ${PROGRAM} APPEND PROPERTY DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+        endif()
+
         # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property
         set_property(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
 
@@ -199,39 +203,20 @@ function(DCMTK_CREATE_INSTALL_EXPORTS)
     # Only create fully-fledged CMake export files if we have the related commands
     include("${DCMTK_MACROS_DIR}/CheckCMakeCommandExists.cmake")
     include(CMakePackageConfigHelpers OPTIONAL)
-    CHECK_CMAKE_COMMAND_EXISTS("CONFIGURE_PACKAGE_CONFIG_FILE")
-    CHECK_CMAKE_COMMAND_EXISTS("WRITE_BASIC_PACKAGE_VERSION_FILE")
-
-    if(HAVE_CONFIGURE_PACKAGE_CONFIG_FILE AND HAVE_WRITE_BASIC_PACKAGE_VERSION_FILE)
 
-      # Create and configure CMake export files
-      include("${DCMTK_MACROS_DIR}/GenerateCMakeExports.cmake")
+    # Create and configure CMake export files
+    include("${DCMTK_MACROS_DIR}/GenerateCMakeExports.cmake")
 
-      # ${DCMTK_INSTALL_CONFIG} and ${DCMTK_CONFIG_VERSION} are
-      # defined within CMake/GenerateCMakeExports.cmake.
-      # Install DCMTKTargets.cmake to install tree
-      install(EXPORT DCMTKTargets FILE DCMTKTargets.cmake NAMESPACE DCMTK::
-              DESTINATION "${DCMTK_INSTALL_CMKDIR}" COMPONENT cmake)
+    # ${DCMTK_INSTALL_CONFIG} and ${DCMTK_CONFIG_VERSION} are
+    # defined within CMake/GenerateCMakeExports.cmake.
+    # Install DCMTKTargets.cmake to install tree
+    install(EXPORT DCMTKTargets FILE DCMTKTargets.cmake NAMESPACE DCMTK::
+            DESTINATION "${DCMTK_INSTALL_CMKDIR}" COMPONENT cmake)
 
-      # Install DCMTKConfig.cmake and DCMTKConfigVersion.cmake
-      install(FILES "${DCMTK_INSTALL_CONFIG}" "${DCMTK_CONFIG_VERSION}"
-              DESTINATION "${DCMTK_INSTALL_CMKDIR}" COMPONENT cmake)
-
-    else()
+    # Install DCMTKConfig.cmake and DCMTKConfigVersion.cmake
+    install(FILES "${DCMTK_INSTALL_CONFIG}" "${DCMTK_CONFIG_VERSION}"
+            DESTINATION "${DCMTK_INSTALL_CMKDIR}" COMPONENT cmake)
 
-      # Warning that we use old "configure_file" command
-      message(STATUS "Warning: Using old configure_file() mechanism to produce DCMTKConfig.cmake")
-
-      # Actually configure file
-      configure_file("${DCMTK_MACROS_DIR}/DCMTKConfig.old_cmake.in"
-                     "${DCMTK_BINARY_DIR}/DCMTKConfig.cmake" @ONLY)
-
-      # Install DCMTKConfig.cmake and DCMTKConfigVersion.cmake
-      install(FILES "${DCMTK_BINARY_DIR}/DCMTKConfig.cmake" "${DCMTK_BINARY_DIR}/DCMTKConfigVersion.cmake"
-              DESTINATION "${DCMTK_INSTALL_CMKDIR}"
-              COMPONENT cmake)
-
-    endif()
 endfunction()
 
 set(DCMTK_MACROS_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "")

CMake/dcmtkPrepare.cmake

@@ -27,14 +27,31 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
+# Expose CMAKE_DEBUG_POSTFIX to the user and extend it for DLLs and executables.
+#
+# If the user wants to use a different postfix for debug build artifacts, he can
+# set this variable (e.g. to "_d").  This will append _d to all libraries built
+# with the exception of Windows DLLS.  If the latter should also have the debug
+# the USE_DEBUG_POSTFIX_FOR_DLLS option must be enabled.
+# To append the debug postfix to executables (except test programs), the
+# USE_DEBUG_POSTFIX_FOR_EXEC option can be used.
+set(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library postfix for debug builds (default: none).")
+# If enabled, the debug postfix will be used for Windows DLLs as well.
+option(USE_DEBUG_POSTFIX_FOR_DLLS "Use CMAKE_DEBUG_POSTFIX also for DLLs on Windows." OFF)
+# If enabled, the debug postfix will be used for executables (except for test programs).
+option(USE_DEBUG_POSTFIX_FOR_EXEC "Use CMAKE_DEBUG_POSTFIX also for executables." OFF)
+# Check whether the user enabled one of the USE_DEBUG_POSTFIX options but did not set CMAKE_DEBUG_POSTFIX.
+if((USE_DEBUG_POSTFIX_FOR_DLLS OR USE_DEBUG_POSTFIX_FOR_EXEC) AND NOT CMAKE_DEBUG_POSTFIX)
+  message(FATAL_ERROR "USE_DEBUG_POSTFIX_FOR_DLLS or USE_DEBUG_POSTFIX_FOR_EXEC is enabled, but CMAKE_DEBUG_POSTFIX does not have a value.")
+endif()
 
 # Basic version information
 set(DCMTK_MAJOR_VERSION 3)
 set(DCMTK_MINOR_VERSION 6)
-set(DCMTK_BUILD_VERSION 8)
+set(DCMTK_BUILD_VERSION 9)
 # The ABI is not guaranteed to be stable between different snapshots/releases,
 # so this particular version number is increased for each snapshot or release.
-set(DCMTK_ABI_VERSION 18)
+set(DCMTK_ABI_VERSION 19)
 
 # Package "release" settings (some are currently unused and, therefore, disabled)
 set(DCMTK_PACKAGE_NAME "dcmtk")
@@ -51,8 +68,8 @@ option(DCMTK_LINK_STATIC "Statically link all libraries and tools with the runti
 # Modify linker flags and libraries for static builds if enabled by the user
 if(DCMTK_LINK_STATIC)
     if (NOT APPLE)
-        # MacOS does not support static libraries. DCMTK_LINK_STATIC is still useful on MacOS though,
-        # since it will create binaries that only depend on MacOS's libc.
+        # MacOS does not support static libraries. DCMTK_LINK_STATIC is still useful on
+        # macOS though, since it will create binaries that only depend on macOS's libc.
         set(CMAKE_EXE_LINKER_FLAGS "-static")
     endif()
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
@@ -72,6 +89,10 @@ else()
     set(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_ABI_VERSION}.${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
 endif()
 
+if(CMAKE_DEBUG_POSTFIX AND USE_DEBUG_POSTFIX_FOR_DLLS)
+    list(APPEND DCMTK_LIBRARY_PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+endif()
+
 option(DCMTK_PORTABLE_LINUX_BINARIES "Create ELF binaries while statically linking all third party libraries and libstdc++." OFF)
 if(DCMTK_PORTABLE_LINUX_BINARIES)
     if (DCMTK_LINK_STATIC)
@@ -142,7 +163,6 @@ option(BUILD_APPS "Build command line applications and test programs." ON)
 option(BUILD_SHARED_LIBS "Build with shared libraries." OFF)
 option(BUILD_SINGLE_SHARED_LIBRARY "Build a single DCMTK library." OFF)
 mark_as_advanced(BUILD_SINGLE_SHARED_LIBRARY)
-set(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library postfix for debug builds. Usually left blank.")
 set(DCMTK_TLS_LIBRARY_POSTFIX "" CACHE STRING "Postfix for libraries that change their ABI when using OpenSSL.")
 # add our CMake modules to the module path, but prefer the ones from CMake.
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_ROOT}/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/${DCMTK_CMAKE_INCLUDE}/CMake/")
@@ -188,6 +208,7 @@ DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_STRING "Enable use of STL string.")
 DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_TYPE_TRAITS "Enable use of STL type traits.")
 DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_TUPLE "Enable use of STL tuple.")
 DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_SYSTEM_ERROR "Enable use of STL system_error.")
+DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_ATOMIC "Enable use of STL atomic.")
 
 # On Windows, the built-in dictionary is default, on Unix the external one.
 # It is not possible to use both, built-in plus external default dictionary.
@@ -475,8 +496,8 @@ if(WIN32)   # special handling for Windows systems
 
 else()   # ... for non-Windows systems
 
-  # Compiler flags for Mac OS X
-  if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  # Compiler flags for macOS and iOS
+  if(CMAKE_SYSTEM_NAME MATCHES "Darwin" OR CMAKE_SYSTEM_NAME MATCHES "iOS")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_DARWIN_C_SOURCE")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_DARWIN_C_SOURCE")
   # Compiler flags for NetBSD
@@ -668,6 +689,7 @@ if(DCMTK_WITH_OPENSSL)
   CHECK_FUNCTIONWITHHEADER_EXISTS("SSL_CTX_set1_sigalgs(0,0,0)" "openssl/ssl.h" HAVE_OPENSSL_PROTOTYPE_SSL_CTX_SET1_SIGALGS)
   CHECK_FUNCTIONWITHHEADER_EXISTS("TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM_8" "openssl/ssl.h" HAVE_OPENSSL_PROTOTYPE_TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM_8)
   CHECK_FUNCTIONWITHHEADER_EXISTS("TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384" "openssl/ssl.h" HAVE_OPENSSL_PROTOTYPE_TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384)
+  CHECK_FUNCTIONWITHHEADER_EXISTS("TS_VERIFY_CTX_set0_store(0,0)" "openssl/ts.h" HAVE_OPENSSL_PROTOTYPE_TS_VERIFY_CTX_SET0_STORE)
 
   # test presence of functions, constants and macros needed for the dcmsign module
   CHECK_FUNCTIONWITHHEADER_EXISTS("EVP_PKEY_get_group_name" "openssl/evp.h" HAVE_OPENSSL_PROTOTYPE_EVP_PKEY_GET_GROUP_NAME)

CMake/osconfig.h.in

@@ -493,6 +493,9 @@
 /* Define to 1 if you have the `_findfirst' function. */
 #cmakedefine HAVE__FINDFIRST @HAVE__FINDFIRST@
 
+/* Define to 1 if you have the `_set_output_format' function. */
+#cmakedefine HAVE__SET_OUTPUT_FORMAT @HAVE__SET_OUTPUT_FORMAT@
+
 /* Define to 1 if the compiler supports __FUNCTION__. */
 #cmakedefine HAVE___FUNCTION___MACRO @HAVE___FUNCTION___MACRO@
 
@@ -644,7 +647,11 @@
 /* Define `ssize_t' to `long' if <sys/types.h> does not define. */
 #cmakedefine HAVE_NO_TYPEDEF_SSIZE_T
 #ifdef HAVE_NO_TYPEDEF_SSIZE_T
-#define ssize_t long
+#if defined(_WIN64)
+ typedef __int64 ssize_t;
+#else
+ typedef long ssize_t;
+#endif
 #endif
 
 /* Set typedefs as needed for JasPer library */
@@ -857,6 +864,9 @@ DCMTK was configured to use C++20 features, but your compiler does not or was no
 /* Define if we are supposed to use STL's system_error */
 #cmakedefine HAVE_STL_SYSTEM_ERROR @HAVE_STL_SYSTEM_ERROR@
 
+/* Define if we are supposed to use STL's atomic */
+#cmakedefine HAVE_STL_ATOMIC @HAVE_STL_ATOMIC@
+
 /* Define if the input iterator category is supported */
 #cmakedefine HAVE_CONTIGUOUS_ITERATOR_CATEGORY @HAVE_CONTIGUOUS_ITERATOR_CATEGORY@
 
@@ -886,6 +896,9 @@ DCMTK was configured to use C++20 features, but your compiler does not or was no
 /* Define if we have OpenSSL with the TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 macro */
 #cmakedefine HAVE_OPENSSL_PROTOTYPE_TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 @HAVE_OPENSSL_PROTOTYPE_TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384@
 
+/* Define if we have OpenSSL with the TS_VERIFY_CTX_set0_store() function */
+#cmakedefine HAVE_OPENSSL_PROTOTYPE_TS_VERIFY_CTX_SET0_STORE @HAVE_OPENSSL_PROTOTYPE_TS_VERIFY_CTX_SET0_STORE@
+
 /* Define if we have OpenSSL with the new typedef of EVP_MD_CTX as struct evp_md_ctx_st */
 #cmakedefine HAVE_OPENSSL_DECLARATION_NEW_EVP_MD_CTX @HAVE_OPENSSL_DECLARATION_NEW_EVP_MD_CTX@
 

CMakeLists.txt

@@ -1,9 +1,9 @@
 # Minimum CMake version required
-cmake_minimum_required(VERSION 3.1.3...3.29.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.7.0...3.31.2 FATAL_ERROR)
 
 # Declare project
 project(DCMTK)
-if (NOT DEFINED CMAKE_CXX_STANDARD)
+if(NOT DEFINED CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD "11" CACHE STRING "Set C++ standard to be used (98,11,14,17,20)")
 else()
   set(CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD} CACHE STRING "Set C++ standard to be used (98,11,14,17,20)")
@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_CXX_STANDARD)
 set(DCMTK_MODULES ofstd oflog oficonv dcmdata dcmimgle
   dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr
   dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmiod dcmfg
-  dcmseg dcmtract dcmpmap dcmect
+  dcmseg dcmtract dcmpmap dcmect dcmapps
   CACHE STRING "List of modules that should be built.")
 
 # Provide an interface target to elegantly include the config directory