Mercurial > hg > orthanc-wsi
changeset 606:9034e40dbbdd
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 09 Sep 2026 08:17:26 +0200 |
| parents | 5b30b8d2b9e8 |
| children | e447a2b8a8f2 |
| files | Resources/Orthanc/CMake/DownloadOrthancFramework.cmake |
| diffstat | 1 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Sep 09 08:15:31 2026 +0200 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Sep 09 08:17:26 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()