mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-19 21:50:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-qcc-compiler-id' into release

Browse Source
This commit is contained in:
Brad King
2015-01-15 09:59:25 -05:00
parent d58396b722 9c9bc71256
commit 41eb20f8fc
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeCCompilerId.c.in
View File

@@ -18,7 +18,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
#endif
#ifdef __QNXNTO__
char const* qnxnto = "INFO" ":" "qnxnto";
char const* qnxnto = "INFO" ":" "qnxnto[]";
#endif
@CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@

2
Modules/CMakeCXXCompilerId.cpp.in
View File

@@ -17,7 +17,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
#endif
#ifdef __QNXNTO__
char const* qnxnto = "INFO" ":" "qnxnto";
char const* qnxnto = "INFO" ":" "qnxnto[]";
#endif
@CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@

2
Modules/CMakeDetermineCompilerId.cmake
View File

@@ -440,7 +440,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
string(REGEX REPLACE "^0+([0-9])" "\\1" SIMULATE_VERSION "${CMAKE_MATCH_1}")
string(REGEX REPLACE "\\.0+([0-9])" ".\\1" SIMULATE_VERSION "${SIMULATE_VERSION}")
endif()
if("${info}" MATCHES "INFO:qnxnto")
if("${info}" MATCHES "INFO:qnxnto\\[\\]")
set(COMPILER_QNXNTO 1)
endif()
endforeach()