comparison CMakeLists.txt @ 238:aa230d13c442

fix default branch
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 May 2020 09:43:31 +0200
parents cce89307af28
children fa67145e0278
comparison
equal deleted inserted replaced
232:b70d22f79320 238:aa230d13c442
22 project(OrthancWebViewer) 22 project(OrthancWebViewer)
23 23
24 set(ORTHANC_PLUGIN_VERSION "mainline") 24 set(ORTHANC_PLUGIN_VERSION "mainline")
25 25
26 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline") 26 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
27 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") 27 #set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
28 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.1") # TODO - Must be set to "mainline" after 1.7.0
28 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") 29 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
29 else() 30 else()
30 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.1") 31 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.1")
31 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") 32 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
32 endif() 33 endif()