Mercurial > hg > orthanc

changeset 5505:b305bc32b77d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgraded to zlib 1.3.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 24 Jan 2024 17:51:21 +0100
parents 5910aa0c96ce
children 0446fa29de49
files NEWS OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake OrthancFramework/Resources/CMake/ZlibConfiguration.cmake OrthancServer/UnitTestsSources/VersionsTests.cpp
diffstat 5 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Jan 24 17:31:12 2024 +0100
+++ b/NEWS	Wed Jan 24 17:51:21 2024 +0100
@@ -15,6 +15,7 @@
   - curl 8.5.0
   - dcmtk 3.6.8
   - openssl 3.1.4
+  - zlib 1.3.1
 
 
 Version 1.12.2 (2023-12-19)
--- a/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake	Wed Jan 24 17:31:12 2024 +0100
+++ b/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake	Wed Jan 24 17:51:21 2024 +0100
@@ -66,6 +66,7 @@
   if (ENABLE_DCMTK_NETWORKING)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
     include_directories(
+      BEFORE SYSTEM
       ${DCMTK_SOURCES_DIR}/dcmnet/include
       )
   endif()
@@ -74,6 +75,7 @@
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimgle/libsrc DCMTK_SOURCES)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimage/libsrc DCMTK_SOURCES)
     include_directories(
+      BEFORE SYSTEM
       ${DCMTK_SOURCES_DIR}/dcmimage/include
       )
   endif()
@@ -84,6 +86,7 @@
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
     include_directories(
+      BEFORE SYSTEM
       ${DCMTK_SOURCES_DIR}/dcmjpeg/include
       ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
       ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
@@ -120,6 +123,7 @@
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
     include_directories(
+      BEFORE SYSTEM
       ${DCMTK_SOURCES_DIR}/dcmjpeg/include
       ${DCMTK_SOURCES_DIR}/dcmjpls/include
       ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
@@ -143,6 +147,7 @@
   if (ENABLE_DCMTK_NETWORKING AND ENABLE_SSL)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmtls/libsrc DCMTK_SOURCES)
     include_directories(
+      BEFORE SYSTEM
       ${DCMTK_SOURCES_DIR}/dcmtls/include
       )
 
@@ -189,6 +194,7 @@
   endif()
 
   include_directories(
+    BEFORE SYSTEM
     #${DCMTK_SOURCES_DIR}
     ${DCMTK_SOURCES_DIR}/config/include
     ${DCMTK_SOURCES_DIR}/ofstd/include
--- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake	Wed Jan 24 17:31:12 2024 +0100
+++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake	Wed Jan 24 17:51:21 2024 +0100
@@ -91,6 +91,7 @@
 
 
 include_directories(
+  BEFORE SYSTEM
   ${DCMTK_SOURCES_DIR}/dcmiod/include
   ${DCMTK_SOURCES_DIR}/oficonv/include
   )
--- a/OrthancFramework/Resources/CMake/ZlibConfiguration.cmake	Wed Jan 24 17:31:12 2024 +0100
+++ b/OrthancFramework/Resources/CMake/ZlibConfiguration.cmake	Wed Jan 24 17:51:21 2024 +0100
@@ -20,13 +20,14 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB)
-  SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.11)
-  SET(ZLIB_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/zlib-1.2.11.tar.gz")
-  SET(ZLIB_MD5 "1c9f62f0778697a09d36121ead88e08e")
+  SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.3.1)
+  SET(ZLIB_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/zlib-1.3.1.tar.gz")
+  SET(ZLIB_MD5 "9855b6d802d7fe5b7bd5b196a2271655")
 
   DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}")
 
   include_directories(
+    BEFORE SYSTEM
     ${ZLIB_SOURCES_DIR}
     )
 
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 17:31:12 2024 +0100
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 17:51:21 2024 +0100
@@ -107,7 +107,7 @@
 
 TEST(Versions, ZlibStatic)
 {
-  ASSERT_STREQ("1.2.11", zlibVersion());
+  ASSERT_STREQ("1.3.1", zlibVersion());
 }
 
 TEST(Versions, BoostStatic)