This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via e75c8ea26cf3c63487877499252dbf3379374578 (commit)
via 9c9bc71256000c8bedd391e049150b6a0f3b0dc3 (commit)
from c776cbd2c1e7a05b852a2989c5b959867b6f6340 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e75c8ea26cf3c63487877499252dbf3379374578
commit e75c8ea26cf3c63487877499252dbf3379374578
Merge: c776cbd 9c9bc71
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 15 09:57:19 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 15 09:57:19 2015 -0500
Merge topic 'fix-qcc-compiler-id' into next
9c9bc712 QNX: Fix detection of QCC compiler id (#15349)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c9bc71256000c8bedd391e049150b6a0f3b0dc3
commit 9c9bc71256000c8bedd391e049150b6a0f3b0dc3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 14 10:28:59 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 14 10:28:59 2015 -0500
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.
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()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCCompilerId.c.in | 2 +-
Modules/CMakeCXXCompilerId.cpp.in | 2 +-
Modules/CMakeDetermineCompilerId.cmake | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
