Mercurial > hg > orthanc

changeset 6064:0fc3d5d3eef2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix libcurl version test + cleanup curl cmake
author Alain Mazy <am@orthanc.team>
date Thu, 27 Mar 2025 15:13:51 +0100 (7 weeks ago)
parents 04a701840319
children bb2d8132444b
files OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake OrthancFramework/Resources/Patches/curl-8.12.1.patch OrthancServer/UnitTestsSources/VersionsTests.cpp
diffstat 3 files changed, 3 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Thu Mar 27 12:02:57 2025 +0100
+++ b/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Thu Mar 27 15:13:51 2025 +0100
@@ -306,30 +306,17 @@
         HAVE_IOCTL_FIONBIO
         HAVE_IOCTL_SIOCGIFADDR
         HAVE_SETSOCKOPT_SO_NONBLOCK
-        HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
-        TIME_WITH_SYS_TIME
-        HAVE_O_NONBLOCK
-        HAVE_GETHOSTBYADDR_R_5
-        HAVE_GETHOSTBYADDR_R_7
-        HAVE_GETHOSTBYADDR_R_8
-        HAVE_GETHOSTBYADDR_R_5_REENTRANT
-        HAVE_GETHOSTBYADDR_R_7_REENTRANT
-        HAVE_GETHOSTBYADDR_R_8_REENTRANT
         HAVE_GETHOSTBYNAME_R_3
         HAVE_GETHOSTBYNAME_R_5
         HAVE_GETHOSTBYNAME_R_6
         HAVE_GETHOSTBYNAME_R_3_REENTRANT
         HAVE_GETHOSTBYNAME_R_5_REENTRANT
         HAVE_GETHOSTBYNAME_R_6_REENTRANT
-        HAVE_SOCKLEN_T
         HAVE_IN_ADDR_T
         HAVE_BOOL_T
         STDC_HEADERS
-        RETSIGTYPE_TEST
-        HAVE_INET_NTOA_R_DECL
-        HAVE_INET_NTOA_R_DECL_REENTRANT
-        HAVE_GETADDRINFO
         HAVE_FILE_OFFSET_BITS
+        HAVE_ATOMIC
         )
       curl_internal_test(${CURL_TEST})
     endforeach(CURL_TEST)
--- a/OrthancFramework/Resources/Patches/curl-8.12.1.patch	Thu Mar 27 12:02:57 2025 +0100
+++ b/OrthancFramework/Resources/Patches/curl-8.12.1.patch	Thu Mar 27 15:13:51 2025 +0100
@@ -9,4 +9,4 @@
 +      "${CURL_SOURCES_DIR}/CMake/CurlTests.c"
        CMAKE_FLAGS
          "-DCOMPILE_DEFINITIONS:STRING=-D${_curl_test} ${CURL_TEST_DEFINES} ${_cmake_required_definitions}"
-         "${_curl_test_add_libraries}"
\ No newline at end of file
+         "${_curl_test_add_libraries}"
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Thu Mar 27 12:02:57 2025 +0100
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Thu Mar 27 15:13:51 2025 +0100
@@ -120,7 +120,7 @@
 TEST(Versions, CurlStatic)
 {
   curl_version_info_data* v = curl_version_info(CURLVERSION_NOW);
-  ASSERT_STREQ("8.9.0", v->version);
+  ASSERT_STREQ("8.12.1", v->version);
 }
 
 TEST(Versions, PngStatic)