mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'qnx_compiler_detection'

Browse Source 
243b7c40d4 QNX: Compiler and feature detection fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: MvdHurk <maikelvandenhurk@hotmail.com>
Merge-request: !2699
This commit is contained in:
Brad King
2018-12-07 13:27:17 +00:00
committed by Kitware Robot
parent e6af2f3d2e 243b7c40d4
commit fdd09a0269
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/CMakeDetermineCCompiler.cmake
+2 -2
View File
@@ -136,7 +136,7 @@ endif ()
# "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|QCC")
get_filename_component(COMPILER_BASENAME "${CMAKE_C_COMPILER}" NAME)
if (COMPILER_BASENAME MATCHES "^(.+-)(clang|g?cc)(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
@@ -145,7 +145,7 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
endif()
elseif(COMPILER_BASENAME MATCHES "qcc(\\.exe)?$")
if(CMAKE_C_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?")
if(CMAKE_C_COMPILER_TARGET MATCHES "gcc_nto([a-z0-9]+_[0-9]+|[^_le]+)(le)?")
set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
endif()
endif ()
Modules/CMakeDetermineCXXCompiler.cmake
+2 -2
View File
@@ -133,7 +133,7 @@ endif ()
if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|QCC")
get_filename_component(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME)
if (COMPILER_BASENAME MATCHES "^(.+-)(clan)?[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
@@ -142,7 +142,7 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
endif()
elseif(COMPILER_BASENAME MATCHES "QCC(\\.exe)?$")
if(CMAKE_CXX_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?")
if(CMAKE_CXX_COMPILER_TARGET MATCHES "gcc_nto([a-z0-9]+_[0-9]+|[^_le]+)(le)")
set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
endif()
endif ()
Modules/Compiler/QCC-C-FeatureTests.cmake
+1
View File
@@ -0,0 +1 @@
include(Compiler/GNU-C-FeatureTests)
Modules/Compiler/QCC-C.cmake
+3
View File
@@ -1,2 +1,5 @@
# To include compiler feature detection
include(Compiler/GNU-C)
include(Compiler/QCC)
__compiler_qcc(C)
Modules/Compiler/QCC-CXX-FeatureTests.cmake
+1
View File
@@ -0,0 +1 @@
include(Compiler/GNU-CXX-FeatureTests)
Modules/Compiler/QCC-CXX.cmake
+3
View File
@@ -1,3 +1,6 @@
# To include compiler feature detection
include(Compiler/GNU-CXX)
include(Compiler/QCC)
__compiler_qcc(CXX)