changeset 420:c424a0659851 transcoding

"mainline" can become the default framework version, as 1.7.0 is released
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 25 May 2020 13:03:44 +0200
parents 7671ccfc98da
children d575f05723eb
files CMakeLists.txt
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri May 15 08:20:55 2020 +0200
+++ b/CMakeLists.txt	Mon May 25 13:03:44 2020 +0200
@@ -24,11 +24,10 @@
 set(ORTHANC_DICOM_WEB_VERSION "mainline")
 
 if (ORTHANC_DICOM_WEB_VERSION STREQUAL "mainline")
-  # cmake .. -DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_GOOGLE_TEST=OFF -DUSE_SYSTEM_ORTHANC_SDK=OFF -DORTHANC_SDK_VERSION=framework -G Ninja
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "transcoding")  # TODO - Revert this to "mainline"
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.0")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.1")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()