# HG changeset patch # User Sebastien Jodogne # Date 1579798460 -3600 # Node ID 92759b714ae4fff10b44842670e7beec05e412d7 # Parent 1fe74e7d96464482d8988f82084b959aa0104af3 fix compatibility between LSB and cmake >= 3.6 diff -r 1fe74e7d9646 -r 92759b714ae4 Resources/LinuxStandardBaseToolchain.cmake --- a/Resources/LinuxStandardBaseToolchain.cmake Thu Jan 23 15:53:45 2020 +0100 +++ b/Resources/LinuxStandardBaseToolchain.cmake Thu Jan 23 17:54:20 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})