diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-16 14:43:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-16 14:43:59 (GMT) |
| commit | 36428fc5273fcdc4a4c227a932de9e07c8f9d2c8 (patch) | |
| tree | 501ee0744005dc0eaadf640cf6405167c2343f78 | |
| parent | c15a2fdd2ee3552024c3892bb798bb956b4677d9 (diff) | |
| parent | 9c9bc71256000c8bedd391e049150b6a0f3b0dc3 (diff) | |
| download | CMake-36428fc5273fcdc4a4c227a932de9e07c8f9d2c8.zip CMake-36428fc5273fcdc4a4c227a932de9e07c8f9d2c8.tar.gz CMake-36428fc5273fcdc4a4c227a932de9e07c8f9d2c8.tar.bz2 | |
Merge topic 'fix-qcc-compiler-id'
9c9bc712 QNX: Fix detection of QCC compiler id (#15349)
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 2 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 0221cbd..09ae509 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -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@ diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 9ece26d..cc3ab49 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -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@ diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 8edace1..dfed00e 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -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() |