diff Resources/CMake/Version.cmake @ 251:01eb42ad1947

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 11 Dec 2021 16:09:04 +0100
parents e1bbf1031bc7
children 20a730889ae2
line wrap: on
line diff
--- a/Resources/CMake/Version.cmake	Sat Dec 11 11:34:03 2021 +0100
+++ b/Resources/CMake/Version.cmake	Sat Dec 11 16:09:04 2021 +0100
@@ -21,10 +21,10 @@
 set(ORTHANC_WSI_VERSION "mainline")
 
 if (ORTHANC_WSI_VERSION STREQUAL "mainline")
-  set(ORTHANC_FRAMEWORK_VERSION "mainline")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "ae0e3fd609df")  # Framework pre-1.9.8
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "b2e08d83e21d")  # Framework pre-1.9.8
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
@@ -32,6 +32,7 @@
   -DORTHANC_WSI_VERSION="${ORTHANC_WSI_VERSION}"
   )
 
+set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_FRAMEWORK_DEFAULT_VERSION}" CACHE STRING "Version of the Orthanc framework")
 set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc source code (can be \"hg\", \"archive\", \"web\" or \"path\")")
 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\"")