diff Resources/Orthanc/LinuxStandardBaseToolchain.cmake @ 1273:398ea4259e65

merge
author Alain Mazy <alain@mazy.be>
date Mon, 03 Feb 2020 14:57:22 +0100
parents 9a0a95c0b578
children 86f89ab3563e
line wrap: on
line diff
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Mon Feb 03 14:56:56 2020 +0100
+++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Mon Feb 03 14:57:22 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})