# HG changeset patch # User Sebastien Jodogne # Date 1579798808 -3600 # Node ID 649489b9bfdb4b13ddfd5297edb96182877c1498 # Parent b6a569e6e85bbee2e40fca719cf8c5f2ed76024f fix compatibility between LSB and cmake >= 3.6 diff -r b6a569e6e85b -r 649489b9bfdb Resources/LinuxStandardBaseToolchain.cmake --- a/Resources/LinuxStandardBaseToolchain.cmake Thu Jan 23 12:58:08 2020 +0100 +++ b/Resources/LinuxStandardBaseToolchain.cmake Thu Jan 23 18:00:08 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})