Mercurial > hg > orthanc

changeset 6462:0f829c4c8bbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build of framework as a windows dll
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 19 Nov 2025 18:02:22 +0100
parents d442670c27b4
children 6874547dca66
files OrthancFramework/Resources/CMake/BoostConfiguration.cmake OrthancFramework/Resources/CMake/BoostConfigurationStatic-1.69.0.cmake OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake OrthancFramework/Resources/CMake/LibP11Configuration.cmake OrthancFramework/Resources/CMake/MongooseConfiguration.cmake OrthancFramework/Resources/CMake/UuidConfiguration.cmake
diffstat 6 files changed, 69 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/BoostConfiguration.cmake	Wed Nov 19 16:49:13 2025 +0100
+++ b/OrthancFramework/Resources/CMake/BoostConfiguration.cmake	Wed Nov 19 18:02:22 2025 +0100
@@ -282,14 +282,14 @@
       -DBOOST_HAS_FILESYSTEM_V3=1
       )
     list(APPEND BOOST_SOURCES
-      ${BOOST_NAME}/libs/filesystem/src/codecvt_error_category.cpp
-      ${BOOST_NAME}/libs/filesystem/src/directory.cpp
-      ${BOOST_NAME}/libs/filesystem/src/exception.cpp
-      ${BOOST_NAME}/libs/filesystem/src/operations.cpp
-      ${BOOST_NAME}/libs/filesystem/src/path.cpp
-      ${BOOST_NAME}/libs/filesystem/src/path_traits.cpp
-      ${BOOST_NAME}/libs/filesystem/src/portability.cpp
-      ${BOOST_NAME}/libs/filesystem/src/unique_path.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/codecvt_error_category.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/directory.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/exception.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/operations.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/path.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/path_traits.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/portability.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/unique_path.cpp
       )
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR
@@ -301,13 +301,13 @@
 
     elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
       list(APPEND BOOST_SOURCES
-        ${BOOST_NAME}/libs/filesystem/src/windows_file_codecvt.cpp
+        ${BOOST_SOURCES_DIR}/libs/filesystem/src/windows_file_codecvt.cpp
         )
     endif()
   endif()
 
   list(APPEND BOOST_SOURCES
-    ${BOOST_NAME}/libs/iostreams/src/file_descriptor.cpp
+    ${BOOST_SOURCES_DIR}/libs/iostreams/src/file_descriptor.cpp
     )
   
 
--- a/OrthancFramework/Resources/CMake/BoostConfigurationStatic-1.69.0.cmake	Wed Nov 19 16:49:13 2025 +0100
+++ b/OrthancFramework/Resources/CMake/BoostConfigurationStatic-1.69.0.cmake	Wed Nov 19 18:02:22 2025 +0100
@@ -45,15 +45,17 @@
   ## Patching boost
   ## 
 
-  execute_process(
-    COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-    ${CMAKE_CURRENT_LIST_DIR}/../Patches/boost-${BOOST_VERSION}-linux-standard-base.patch
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    RESULT_VARIABLE Failure
-    )
+  if (FirstRun)
+    execute_process(
+      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
+      ${CMAKE_CURRENT_LIST_DIR}/../Patches/boost-${BOOST_VERSION}-linux-standard-base.patch
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      RESULT_VARIABLE Failure
+      )
 
-  if (FirstRun AND Failure)
-    message(FATAL_ERROR "Error while patching a file")
+    if (Failure)
+      message(FATAL_ERROR "Error while patching a file")
+    endif()
   endif()
 
 
@@ -199,10 +201,12 @@
       -DBOOST_HAS_FILESYSTEM_V3=1
       )
     list(APPEND BOOST_SOURCES
-      ${BOOST_NAME}/libs/filesystem/src/codecvt_error_category.cpp
-      ${BOOST_NAME}/libs/filesystem/src/operations.cpp
-      ${BOOST_NAME}/libs/filesystem/src/path.cpp
-      ${BOOST_NAME}/libs/filesystem/src/path_traits.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/codecvt_error_category.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/operations.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/path.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/path_traits.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/portability.cpp
+      ${BOOST_SOURCES_DIR}/libs/filesystem/src/unique_path.cpp
       )
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR
@@ -214,13 +218,13 @@
 
     elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
       list(APPEND BOOST_SOURCES
-        ${BOOST_NAME}/libs/filesystem/src/windows_file_codecvt.cpp
+        ${BOOST_SOURCES_DIR}/libs/filesystem/src/windows_file_codecvt.cpp
         )
     endif()
   endif()
 
   list(APPEND BOOST_SOURCES
-    ${BOOST_NAME}/libs/iostreams/src/file_descriptor.cpp
+    ${BOOST_SOURCES_DIR}/libs/iostreams/src/file_descriptor.cpp
     )
   
 
--- a/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake	Wed Nov 19 16:49:13 2025 +0100
+++ b/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake	Wed Nov 19 18:02:22 2025 +0100
@@ -46,15 +46,17 @@
 
   DownloadPackage(${CIVETWEB_MD5} ${CIVETWEB_URL} "${CIVETWEB_SOURCES_DIR}")
 
-  execute_process(
-    COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-    ${CMAKE_CURRENT_LIST_DIR}/../Patches/civetweb-1.16.patch
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    RESULT_VARIABLE Failure
-    )
+  if (FirstRun)
+    execute_process(
+      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
+      ${CMAKE_CURRENT_LIST_DIR}/../Patches/civetweb-1.16.patch
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      RESULT_VARIABLE Failure
+      )
 
-  if (FirstRun AND Failure)
-    message(FATAL_ERROR "Error while patching a file")
+    if (Failure)
+      message(FATAL_ERROR "Error while patching a file")
+    endif()
   endif()
 
   include_directories(
--- a/OrthancFramework/Resources/CMake/LibP11Configuration.cmake	Wed Nov 19 16:49:13 2025 +0100
+++ b/OrthancFramework/Resources/CMake/LibP11Configuration.cmake	Wed Nov 19 18:02:22 2025 +0100
@@ -37,15 +37,17 @@
 
   DownloadPackage(${LIBP11_MD5} ${LIBP11_URL} "${LIBP11_SOURCES_DIR}")
 
-  # Apply the patches
-  execute_process(
-    COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_LIST_DIR}/../Patches/libp11-0.4.0.patch
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    RESULT_VARIABLE Failure
-    )
+  if (FirstRun)
+    # Apply the patches
+    execute_process(
+      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_LIST_DIR}/../Patches/libp11-0.4.0.patch
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      RESULT_VARIABLE Failure
+      )
 
-  if (Failure AND FirstRun)
-    message(FATAL_ERROR "Error while patching libp11")
+    if (FirstRun)
+      message(FATAL_ERROR "Error while patching libp11")
+    endif()
   endif()
 
   # This command MUST be after applying the patch
--- a/OrthancFramework/Resources/CMake/MongooseConfiguration.cmake	Wed Nov 19 16:49:13 2025 +0100
+++ b/OrthancFramework/Resources/CMake/MongooseConfiguration.cmake	Wed Nov 19 18:02:22 2025 +0100
@@ -50,16 +50,18 @@
     set(MONGOOSE_PATCH ${CMAKE_CURRENT_LIST_DIR}/../Patches/mongoose-3.8-patch.diff)
   endif()
 
-  # Patch mongoose
-  execute_process(
-    COMMAND ${PATCH_EXECUTABLE} -N mongoose.c 
-    INPUT_FILE ${MONGOOSE_PATCH}
-    WORKING_DIRECTORY ${MONGOOSE_SOURCES_DIR}
-    RESULT_VARIABLE Failure
-    )
+  if (FirstRun)
+    # Patch mongoose
+    execute_process(
+      COMMAND ${PATCH_EXECUTABLE} -N mongoose.c
+      INPUT_FILE ${MONGOOSE_PATCH}
+      WORKING_DIRECTORY ${MONGOOSE_SOURCES_DIR}
+      RESULT_VARIABLE Failure
+      )
 
-  if (Failure AND FirstRun)
-    message(FATAL_ERROR "Error while patching a file")
+    if (FirstRun)
+      message(FATAL_ERROR "Error while patching a file")
+    endif()
   endif()
 
   include_directories(
--- a/OrthancFramework/Resources/CMake/UuidConfiguration.cmake	Wed Nov 19 16:49:13 2025 +0100
+++ b/OrthancFramework/Resources/CMake/UuidConfiguration.cmake	Wed Nov 19 18:02:22 2025 +0100
@@ -41,15 +41,17 @@
     ## WebAssembly (used in Stone)
     ## 
 
-    execute_process(
-      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-      ${CMAKE_CURRENT_LIST_DIR}/../Patches/e2fsprogs-1.44.5.patch
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      RESULT_VARIABLE Failure
-      )
+    if (FirstRun)
+      execute_process(
+        COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
+        ${CMAKE_CURRENT_LIST_DIR}/../Patches/e2fsprogs-1.44.5.patch
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        RESULT_VARIABLE Failure
+        )
 
-    if (FirstRun AND Failure)
-      message(FATAL_ERROR "Error while patching a file")
+      if (Failure)
+        message(FATAL_ERROR "Error while patching a file")
+      endif()
     endif()