Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 19:08:07 +08:00
Code Issues Projects Releases Wiki Activity

QCC-CXX: use -x c++ on 8+

Browse Source 
The `-lang-c++` flag has been deprecated.
This commit is contained in:
Ben Boeckel
2025-07-30 17:11:11 -04:00
parent dbe9d4593f
commit 166061629a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/Compiler/QCC-CXX.cmake
View File

@@ -6,10 +6,18 @@ __compiler_qcc(CXX)
# If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the
# default for the driver is not c++.
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.2.0") # QNX 8.0 toolchain
set(_cmake_qcc_cxx_lang_compile_flag "-lang-c++")
set(_cmake_qcc_cxx_lang_link_flag "-lang-c++")
else ()
set(_cmake_qcc_cxx_lang_compile_flag "-x c++")
set(_cmake_qcc_cxx_lang_link_flag "")
endif ()
set(CMAKE_CXX_COMPILE_OBJECT
"<CMAKE_CXX_COMPILER> -lang-c++ <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
"<CMAKE_CXX_COMPILER> ${_cmake_qcc_cxx_lang_compile_flag} <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
set(CMAKE_CXX_LINK_EXECUTABLE
"<CMAKE_CXX_COMPILER> -lang-c++ <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
"<CMAKE_CXX_COMPILER> ${_cmake_qcc_cxx_lang_link_flag} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
unset(_cmake_qcc_cxx_lang_compile_flag)
unset(_cmake_qcc_cxx_lang_link_flag)
set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")