[Cmake-commits] CMake branch, next, updated. v3.0.2-5499-g1e1e74e
Brad King
brad.king at kitware.com
Mon Sep 29 15:59:30 EDT 2014
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 1e1e74e729392e0326daf30f41b5782c15a9d1ee (commit)
via 69fe5920b359398f9618f93e47d199ce889edc23 (commit)
from 0df662b7d88b6a17a2220817e9d2f178c13c279d (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=1e1e74e729392e0326daf30f41b5782c15a9d1ee
commit 1e1e74e729392e0326daf30f41b5782c15a9d1ee
Merge: 0df662b 69fe592
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 29 15:59:30 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 29 15:59:30 2014 -0400
Merge topic 'cleanup-CMP0054' into next
69fe5920 GenerateExportHeader: Avoid if() quoted auto-dereference
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69fe5920b359398f9618f93e47d199ce889edc23
commit 69fe5920b359398f9618f93e47d199ce889edc23
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 29 15:53:13 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 29 15:53:38 2014 -0400
GenerateExportHeader: Avoid if() quoted auto-dereference
When testing CMAKE_CXX_COMPILER_ID values with if(MATCHES),
do not explicitly dereference or quote CMAKE_CXX_COMPILER_ID.
We want if() to auto-dereference the variable and not its value.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index f00b577..0c6256c 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -217,9 +217,9 @@ macro(_test_compiler_hidden_visibility)
AND NOT _INTEL_TOO_OLD
AND NOT WIN32
AND NOT CYGWIN
- AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES XL
- AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES PGI
- AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom)
+ AND NOT CMAKE_CXX_COMPILER_ID MATCHES XL
+ AND NOT CMAKE_CXX_COMPILER_ID MATCHES PGI
+ AND NOT CMAKE_CXX_COMPILER_ID MATCHES Watcom)
check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
check_cxx_compiler_flag(-fvisibility-inlines-hidden
COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
@@ -230,11 +230,11 @@ macro(_test_compiler_hidden_visibility)
endmacro()
macro(_test_compiler_has_deprecated)
- if("${CMAKE_CXX_COMPILER_ID}" MATCHES Borland
- OR "${CMAKE_CXX_COMPILER_ID}" MATCHES HP
+ if(CMAKE_CXX_COMPILER_ID MATCHES Borland
+ OR CMAKE_CXX_COMPILER_ID MATCHES HP
OR GCC_TOO_OLD
- OR "${CMAKE_CXX_COMPILER_ID}" MATCHES PGI
- OR "${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom)
+ OR CMAKE_CXX_COMPILER_ID MATCHES PGI
+ OR CMAKE_CXX_COMPILER_ID MATCHES Watcom)
set(COMPILER_HAS_DEPRECATED "" CACHE INTERNAL
"Compiler support for a deprecated attribute")
else()
-----------------------------------------------------------------------
Summary of changes:
Modules/GenerateExportHeader.cmake | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list