diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-14 15:28:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-14 15:28:59 (GMT) |
| commit | 9c9bc71256000c8bedd391e049150b6a0f3b0dc3 (patch) | |
| tree | 069cf36c2af242c6edbe3a12416ba39bdb1d3297 | |
| parent | c118816d44e178e4364a0c32aaece81a14511237 (diff) | |
| download | CMake-9c9bc71256000c8bedd391e049150b6a0f3b0dc3.zip CMake-9c9bc71256000c8bedd391e049150b6a0f3b0dc3.tar.gz CMake-9c9bc71256000c8bedd391e049150b6a0f3b0dc3.tar.bz2 | |
QNX: Fix detection of QCC compiler id (#15349)
In commit v3.1.0-rc1~113^2 (Use a more reliable regex for extracting
binary INFO strings, 2014-09-03) the matching of INFO: strings was made
more strict and no longer matches just "INFO:qnxnto". Use
"INFO:qnxnto[]" instead to conform to the new pattern.
| -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 6c6a914..9f92cd0 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -445,7 +445,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() |