Mercurial > hg > orthanc
changeset 7082:5205e2e5c3ae streaming
fix build on older version of cmake
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 12 Aug 2026 17:17:49 +0200 |
| parents | 8b31c97470a5 |
| children | ecda88223806 |
| files | OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.7.0.cmake OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake Wed Aug 12 17:01:38 2026 +0200 +++ b/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake Wed Aug 12 17:17:49 2026 +0200 @@ -46,8 +46,8 @@ DownloadPackage(${CIVETWEB_MD5} ${CIVETWEB_URL} "${CIVETWEB_SOURCES_DIR}") + list(APPEND ORTHANC_PATCHES_LIST "civetweb-1.16.patch") # Must be out of "FirstRun" if (FirstRun) - list(APPEND ORTHANC_PATCHES_LIST "civetweb-1.16.patch") execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_LIST_DIR}/../Patches/civetweb-1.16.patch
--- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.7.0.cmake Wed Aug 12 17:01:38 2026 +0200 +++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.7.0.cmake Wed Aug 12 17:17:49 2026 +0200 @@ -52,6 +52,8 @@ DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}") +list(APPEND ORTHANC_PATCHES_LIST "dcmtk-3.7.0-max-nested-sequence.patch") # Must be out of "FirstRun" + if (FirstRun) # Apply the patches execute_process( @@ -65,7 +67,6 @@ message(FATAL_ERROR "Error while patching a file") endif() - list(APPEND ORTHANC_PATCHES_LIST "dcmtk-3.7.0-max-nested-sequence.patch") execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.7.0-max-nested-sequence.patch
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Aug 12 17:01:38 2026 +0200 +++ b/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Aug 12 17:17:49 2026 +0200 @@ -745,7 +745,15 @@ list(LENGTH ORTHANC_PATCHES_LIST ORTHANC_PATCHES_COUNT) if (ORTHANC_PATCHES_COUNT GREATER 0) - list(JOIN ORTHANC_PATCHES_LIST "\",\n \"" ORTHANC_PATCHES_C_BODY) + set(ORTHANC_PATCHES_C_BODY "") + + foreach(PATCH IN LISTS ORTHANC_PATCHES_LIST) + if (ORTHANC_PATCHES_C_BODY) + string(APPEND ORTHANC_PATCHES_C_BODY "\",\n \"") + endif() + string(APPEND ORTHANC_PATCHES_C_BODY "${PATCH}") + endforeach() + set(ORTHANC_PATCHES_C_BODY "\"${ORTHANC_PATCHES_C_BODY}\"") else() set(ORTHANC_PATCHES_C_BODY "")