# HG changeset patch # User Sebastien Jodogne # Date 1788934631 -7200 # Node ID d69d48538985c521f7050feaae2b0a1dd8c2523e # Parent e933daed5eddbc3c791b71a13dadba808f55c83b sync diff -r e933daed5edd -r d69d48538985 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Sep 09 08:16:47 2026 +0200 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Sep 09 08:17:11 2026 +0200 @@ -34,6 +34,14 @@ message(FATAL_ERROR "The variable ORTHANC_FRAMEWORK_SOURCE must be set to \"system\", \"hg\", \"web\", \"archive\" or \"path\"") endif() +# make sure these variables are defined (this happens when called from a plugin of from the UnitTests project) +if(NOT DEFINED THIRD_PARTY_DOWNLOADS_ROOT_URL) + set(THIRD_PARTY_DOWNLOADS_ROOT_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads") +endif() +if(NOT DEFINED ORTHANC_SOURCES_DOWNLOADS_ROOT_URL) + set(ORTHANC_SOURCES_DOWNLOADS_ROOT_URL "https://orthanc.uclouvain.be/downloads/sources/orthanc") +endif() + ## ## Detection of the requested version @@ -245,6 +253,10 @@ # for ScopedThreadNameSetter set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "f078ca997217b831ab3f6741f08a8c07") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "c1dcb63cde6f") + # framework post-1.13.0 for THIRD_PARTY_DOWNLOADS_ROOT_URL and ORTHANC_SOURCES_DOWNLOADS_ROOT_URL + set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) + set(ORTHANC_FRAMEWORK_MD5 "6fcb0ceac5006a5e3a6e3efcf6aaba26") endif() endif() endif() @@ -382,9 +394,9 @@ # Default case: Download from the official Web site set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz) if (ORTHANC_FRAMEWORK_PRE_RELEASE) - set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}") + set(ORTHANC_FRAMEWORK_URL "${THIRD_PARTY_DOWNLOADS_ROOT_URL}/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}") else() - set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/sources/orthanc/${ORTHANC_FRAMEMORK_FILENAME}") + set(ORTHANC_FRAMEWORK_URL "${ORTHANC_SOURCES_DOWNLOADS_ROOT_URL}/${ORTHANC_FRAMEMORK_FILENAME}") endif() endif() diff -r e933daed5edd -r d69d48538985 Resources/Orthanc/CMake/GoogleTestConfiguration.cmake --- a/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Wed Sep 09 08:16:47 2026 +0200 +++ b/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Wed Sep 09 08:17:11 2026 +0200 @@ -51,7 +51,7 @@ elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST) set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/googletest-release-1.8.1) - set(GOOGLE_TEST_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/gtest-1.8.1.tar.gz") + set(GOOGLE_TEST_URL "${THIRD_PARTY_DOWNLOADS_ROOT_URL}/gtest-1.8.1.tar.gz") set(GOOGLE_TEST_MD5 "2e6fbeb6a91310a16efe181886c59596") DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}")