Mercurial > hg > orthanc-object-storage
changeset 129:fe51b4fb5132
fix framework version
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Fri, 24 Nov 2023 17:16:02 +0100 |
| parents | dd0068c70937 |
| children | 17f350ab12ca |
| files | Aws/CMakeLists.txt Azure/CMakeLists.txt Google/CMakeLists.txt |
| diffstat | 3 files changed, 28 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Aws/CMakeLists.txt Fri Nov 24 15:40:57 2023 +0100 +++ b/Aws/CMakeLists.txt Fri Nov 24 17:16:02 2023 +0100 @@ -25,7 +25,7 @@ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "b83192e7ad10") # TODO: update to web - 1.12.2 when available + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") # TODO: update to web - 1.12.2 when available set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") endif()
--- a/Azure/CMakeLists.txt Fri Nov 24 15:40:57 2023 +0100 +++ b/Azure/CMakeLists.txt Fri Nov 24 17:16:02 2023 +0100 @@ -21,12 +21,22 @@ set(PLUGIN_VERSION "mainline") -include(CheckIncludeFileCXX) +if (PLUGIN_VERSION STREQUAL "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") +else() + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") # TODO: update to web - 1.12.2 when available + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") +endif() -set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source") -set(ORTHANC_FRAMEWORK_VERSION "b83192e7ad10" CACHE STRING "orthanc framework version") # TODO: update to web - 1.12.2 when available +set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc framework (can be \"system\", \"hg\", \"archive\", \"web\" or \"path\")") +set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_FRAMEWORK_DEFAULT_VERSION}" CACHE STRING "Version of the Orthanc framework") +set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"") +set(ORTHANC_FRAMEWORK_ROOT "" CACHE STRING "Path to the Orthanc source directory, if ORTHANC_FRAMEWORK_SOURCE is \"path\"") set(ALLOW_DOWNLOADS ON) +include(CheckIncludeFileCXX) + # Download and setup the Orthanc framework include(${CMAKE_SOURCE_DIR}/../Common/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
--- a/Google/CMakeLists.txt Fri Nov 24 15:40:57 2023 +0100 +++ b/Google/CMakeLists.txt Fri Nov 24 17:16:02 2023 +0100 @@ -21,12 +21,23 @@ set(PLUGIN_VERSION "mainline") -include(CheckIncludeFileCXX) +if (PLUGIN_VERSION STREQUAL "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") +else() + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") # TODO: update to web - 1.12.2 when available + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") +endif() -set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source") -set(ORTHANC_FRAMEWORK_VERSION "b83192e7ad10" CACHE STRING "orthanc framework version") # TODO: update to web - 1.12.2 when available +set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc framework (can be \"system\", \"hg\", \"archive\", \"web\" or \"path\")") +set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_FRAMEWORK_DEFAULT_VERSION}" CACHE STRING "Version of the Orthanc framework") +set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"") +set(ORTHANC_FRAMEWORK_ROOT "" CACHE STRING "Path to the Orthanc source directory, if ORTHANC_FRAMEWORK_SOURCE is \"path\"") set(ALLOW_DOWNLOADS ON) + +include(CheckIncludeFileCXX) + # Download and setup the Orthanc framework include(${CMAKE_SOURCE_DIR}/../Common/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)