diff Resources/Orthanc/LinuxStandardBaseToolchain.cmake @ 1268:9a0a95c0b578

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 31 Jan 2020 17:25:27 +0100
parents 943f9fb02496
children 86f89ab3563e
line wrap: on
line diff
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Tue Jan 28 19:21:11 2020 +0100
+++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Fri Jan 31 17:25:27 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})