comparison Resources/CMake/Version.cmake @ 223:443f219a68fd

sync, compatibility with Orthanc framework 1.8.2
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 13 Jan 2021 09:23:22 +0100
parents 43b9c80594ed
children 4eefa34657f0
comparison
equal deleted inserted replaced
222:68cc194e69e5 223:443f219a68fd
2 2
3 if (ORTHANC_WSI_VERSION STREQUAL "mainline") 3 if (ORTHANC_WSI_VERSION STREQUAL "mainline")
4 set(ORTHANC_FRAMEWORK_VERSION "mainline") 4 set(ORTHANC_FRAMEWORK_VERSION "mainline")
5 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") 5 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
6 else() 6 else()
7 set(ORTHANC_FRAMEWORK_VERSION "1.7.0") 7 set(ORTHANC_FRAMEWORK_VERSION "1.8.2")
8 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") 8 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
9 endif() 9 endif()
10 10
11 add_definitions( 11 add_definitions(
12 -DHAS_ORTHANC_EXCEPTION=1
12 -DORTHANC_WSI_VERSION="${ORTHANC_WSI_VERSION}" 13 -DORTHANC_WSI_VERSION="${ORTHANC_WSI_VERSION}"
13 ) 14 )
14 15
15 set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc source code (can be \"hg\", \"archive\", \"web\" or \"path\")") 16 set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc source code (can be \"hg\", \"archive\", \"web\" or \"path\")")
16 set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"") 17 set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"")