Mercurial > hg > orthanc

changeset 5512:0a74634073c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix static builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 24 Jan 2024 21:58:14 +0100
parents 17dd8b26d0ec
children 386d7071b79d e998ca3e20be
files OrthancFramework/Resources/CMake/BoostConfiguration.cmake OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake OrthancFramework/Resources/CMake/LibJpegConfiguration.cmake OrthancFramework/Resources/CMake/LibPngConfiguration.cmake OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake OrthancFramework/Resources/CMake/PugixmlConfiguration.cmake OrthancFramework/Resources/CMake/ZlibConfiguration.cmake OrthancFramework/Sources/Images/JpegReader.cpp
diffstat 11 files changed, 9 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/BoostConfiguration.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/BoostConfiguration.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -134,7 +134,7 @@
   endif()
 
   include_directories(
-    BEFORE SYSTEM
+    BEFORE
     ${BOOST_SOURCES_DIR}
     ${BOOST_SOURCES_DIR}/libs/atomic/src/
     ${BOOST_SOURCES_DIR}/libs/locale/src/
--- a/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -66,7 +66,6 @@
   if (ENABLE_DCMTK_NETWORKING)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
     include_directories(
-      BEFORE SYSTEM
       ${DCMTK_SOURCES_DIR}/dcmnet/include
       )
   endif()
@@ -75,7 +74,6 @@
     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()
@@ -86,7 +84,6 @@
     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
@@ -123,7 +120,6 @@
     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
@@ -147,7 +143,6 @@
   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
       )
 
@@ -194,7 +189,6 @@
   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 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -91,7 +91,6 @@
 
 
 include_directories(
-  BEFORE SYSTEM
   ${DCMTK_SOURCES_DIR}/dcmiod/include
   ${DCMTK_SOURCES_DIR}/oficonv/include
   )
--- a/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -44,7 +44,6 @@
     )
 
   include_directories(
-    BEFORE SYSTEM
     ${JSONCPP_SOURCES_DIR}/include
     )
 
--- a/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -46,15 +46,14 @@
   endif()
   
   include_directories(
-    SYSTEM BEFORE
     ${CURL_SOURCES_DIR}/include
-    ${CURL_SOURCES_DIR}/lib
     )
 
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES)
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vauth CURL_SOURCES)
+  AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vssh CURL_SOURCES)
+  AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES)
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vquic CURL_SOURCES)
-  AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES)
   source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*)
 
   add_definitions(
@@ -85,17 +84,18 @@
   endif()
 
   if (NOT EXISTS "${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h")
-    #file(WRITE ${CURL_SOURCES_DIR}/lib/curl_config.h "")
-
-    file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h "#include \"../vauth.h\"\n")
     file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/digest.h "#include \"../digest.h\"\n")
     file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/ntlm.h "#include \"../ntlm.h\"\n")
+    file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h "#include \"../vauth.h\"\n")
     file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vtls/vtls.h "#include \"../../vtls/vtls.h\"\n")
+    file(WRITE ${CURL_SOURCES_DIR}/lib/vssh/curl_setup.h "#include \"../curl_setup.h\"\n")
+    file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/vauth/vauth.h "#include \"../../vauth/vauth.h\"\n")
 
     file(GLOB CURL_LIBS_HEADERS ${CURL_SOURCES_DIR}/lib/*.h)
     foreach (header IN LISTS CURL_LIBS_HEADERS)
       get_filename_component(filename ${header} NAME)
       file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/${filename} "#include \"../${filename}\"\n")
+      file(WRITE ${CURL_SOURCES_DIR}/lib/vquic/${filename} "#include \"../${filename}\"\n")
       file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/${filename} "#include \"../${filename}\"\n")
     endforeach()
   endif()
--- a/OrthancFramework/Resources/CMake/LibJpegConfiguration.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/LibJpegConfiguration.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -27,7 +27,6 @@
     "${LIBJPEG_SOURCES_DIR}")
 
   include_directories(
-    BEFORE  # Adding "SYSTEM" here makes LSB compilation fail
     ${LIBJPEG_SOURCES_DIR}
     )
 
--- a/OrthancFramework/Resources/CMake/LibPngConfiguration.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/LibPngConfiguration.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -27,7 +27,6 @@
   DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}")
 
   include_directories(
-    BEFORE  # Adding "SYSTEM" here makes LSB compilation fail
     ${LIBPNG_SOURCES_DIR}
     )
 
--- a/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -124,7 +124,7 @@
 
 
 include_directories(
-  BEFORE SYSTEM
+  BEFORE
   ${OPENSSL_SOURCES_DIR}
   ${OPENSSL_SOURCES_DIR}/crypto/asn1
   ${OPENSSL_SOURCES_DIR}/crypto/ec/curve448
--- a/OrthancFramework/Resources/CMake/PugixmlConfiguration.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/PugixmlConfiguration.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -27,7 +27,6 @@
   DownloadPackage(${PUGIXML_MD5} ${PUGIXML_URL} "${PUGIXML_SOURCES_DIR}")
 
   include_directories(
-    BEFORE SYSTEM
     ${PUGIXML_SOURCES_DIR}/src
     )
 
--- a/OrthancFramework/Resources/CMake/ZlibConfiguration.cmake	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Resources/CMake/ZlibConfiguration.cmake	Wed Jan 24 21:58:14 2024 +0100
@@ -27,7 +27,6 @@
   DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}")
 
   include_directories(
-    BEFORE  # Adding "SYSTEM" here makes LSB compilation fail
     ${ZLIB_SOURCES_DIR}
     )
 
--- a/OrthancFramework/Sources/Images/JpegReader.cpp	Wed Jan 24 21:58:04 2024 +0100
+++ b/OrthancFramework/Sources/Images/JpegReader.cpp	Wed Jan 24 21:58:14 2024 +0100
@@ -158,8 +158,7 @@
     jpeg_create_decompress(&cinfo);
     jpeg_mem_src(&cinfo, 
       const_cast<unsigned char*>(
-        reinterpret_cast<const unsigned char*>(buffer)),
-      static_cast<unsigned long>(size));
+        reinterpret_cast<const unsigned char*>(buffer)), size);
 
     try
     {