Mercurial > hg > orthanc-dicomweb

changeset 378:20bb2a2eeb1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 23 Jan 2020 18:19:04 +0100
parents dfec31bf370f
children 9a51bf197165
files Resources/Orthanc/DownloadOrthancFramework.cmake Resources/Orthanc/LinuxStandardBaseToolchain.cmake
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu Jan 23 16:05:31 2020 +0100
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu Jan 23 18:19:04 2020 +0100
@@ -110,6 +110,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "3c29de1e289b5472342947168f0105c0")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.7")
         set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8")
+        set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336")
       endif()
     endif()
   endif()
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Thu Jan 23 16:05:31 2020 +0100
+++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Thu Jan 23 18:19:04 2020 +0100
@@ -31,7 +31,12 @@
 
 # which compilers to use for C and C++
 SET(CMAKE_C_COMPILER ${LSB_PATH}/bin/lsbcc)
-CMAKE_FORCE_CXX_COMPILER(${LSB_PATH}/bin/lsbc++ GNU)
+
+if (${CMAKE_VERSION} VERSION_LESS "3.6.0") 
+  CMAKE_FORCE_CXX_COMPILER(${LSB_PATH}/bin/lsbc++ GNU)
+else()
+  SET(CMAKE_CXX_COMPILER ${LSB_PATH}/bin/lsbc++)
+endif()
 
 # here is the target environment located
 SET(CMAKE_FIND_ROOT_PATH ${LSB_PATH})