[Cmake-commits] CMake branch, next, updated. v2.8.5-1690-g83dc7d0
Stephen Kelly
steveire at gmail.com
Tue Aug 23 14:11:50 EDT 2011
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 83dc7d053e72d22c398f18b6038dcd3a3404b2ec (commit)
via 03d60c7d818584c5c44d2992b6cba1e202cdd498 (commit)
via 6adeda9f55ca81b3715dd7512f2cd3c3218bd6ab (commit)
via e253348ecd8cedc0f5fe640e613b2d19bd5641ae (commit)
via 32eff0caec8fa896fdbb58d259c5cff2614279c3 (commit)
from 6fb8c88e9b102ab21f8467b1dbec39afb047ad7f (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=83dc7d053e72d22c398f18b6038dcd3a3404b2ec
commit 83dc7d053e72d22c398f18b6038dcd3a3404b2ec
Merge: 6fb8c88 03d60c7
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 23 14:11:44 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 23 14:11:44 2011 -0400
Merge topic 'generate_export_header' into next
03d60c7 Try to make the macros do almost nothing for Watcom.
6adeda9 Possibly fix configuration test on AIX.
e253348 Possibly fix test on HPUX.
32eff0c Test for too-old-intel compilers.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03d60c7d818584c5c44d2992b6cba1e202cdd498
commit 03d60c7d818584c5c44d2992b6cba1e202cdd498
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 23 20:04:56 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 23 20:07:42 2011 +0200
Try to make the macros do almost nothing for Watcom.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 1d4c482..6225f70 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -160,7 +160,13 @@ macro(_test_compiler_hidden_visibility)
# Exclude XL here because it misinterprets -fvisibility=hidden even though
# the check_cxx_compiler_flag passes
# http://www.cdash.org/CDash/testDetails.php?test=109109951&build=1419259
- if (NOT GCC_TOO_OLD 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)
+ if (NOT GCC_TOO_OLD
+ 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)
check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
check_cxx_compiler_flag(-fvisibility-inlines-hidden COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
option(USE_COMPILER_HIDDEN_VISIBILITY "Use HIDDEN visibility support if available." ON)
@@ -169,7 +175,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 OR GCC_TOO_OLD OR "${CMAKE_CXX_COMPILER_ID}" MATCHES PGI)
+ 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)
set(COMPILER_HAS_DEPRECATED "" CACHE INTERNAL "Compiler support for a deprecated attribute")
else()
_check_cxx_compiler_attribute("__attribute__((__deprecated__))" COMPILER_HAS_DEPRECATED_ATTR)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6adeda9f55ca81b3715dd7512f2cd3c3218bd6ab
commit 6adeda9f55ca81b3715dd7512f2cd3c3218bd6ab
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 23 19:58:42 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 23 19:58:42 2011 +0200
Possibly fix configuration test on AIX.
diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index 788bf35..91008c3 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -33,6 +33,7 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
FAIL_REGEX "[Uu]nknown option" # HP
FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro
FAIL_REGEX "command option .* is not recognized" # XL
+ FAIL_REGEX "not supported in this configuration; ignored" # AIX
)
SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
ENDMACRO (CHECK_CXX_COMPILER_FLAG)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e253348ecd8cedc0f5fe640e613b2d19bd5641ae
commit e253348ecd8cedc0f5fe640e613b2d19bd5641ae
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 23 19:49:52 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 23 19:49:52 2011 +0200
Possibly fix test on HPUX.
diff --git a/Tests/Module/GenerateExportHeader/exportheader_test.cpp b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
index cfc1a05..55c3c1a 100644
--- a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
@@ -79,4 +79,4 @@ int main()
libstatic_excluded();
return 0;
-}
\ No newline at end of file
+}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32eff0caec8fa896fdbb58d259c5cff2614279c3
commit 32eff0caec8fa896fdbb58d259c5cff2614279c3
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 23 19:49:39 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 23 19:49:39 2011 +0200
Test for too-old-intel compilers.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 7a4b6d3..1d4c482 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -146,10 +146,21 @@ macro(_test_compiler_hidden_visibility)
endif()
endif()
+ if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
+ exec_program(${CMAKE_CXX_COMPILER} ARGS -V OUTPUT_VARIABLE _intel_version_info)
+ string (REGEX REPLACE ".*Version ([0-9]+(\\.[0-9]+)+).*" "\\1" _intel_version "${_intel_version_info}")
+
+ if(${_intel_version} VERSION_LESS "12.0")
+ set(_INTEL_TOO_OLD TRUE)
+ message(WARNING "Intel compiler older than 12.0")
+ endif()
+ endif()
+
+
# Exclude XL here because it misinterprets -fvisibility=hidden even though
# the check_cxx_compiler_flag passes
# http://www.cdash.org/CDash/testDetails.php?test=109109951&build=1419259
- if (NOT GCC_TOO_OLD AND NOT WIN32 AND NOT CYGWIN AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES XL AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES PGI)
+ if (NOT GCC_TOO_OLD 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)
check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
check_cxx_compiler_flag(-fvisibility-inlines-hidden COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
option(USE_COMPILER_HIDDEN_VISIBILITY "Use HIDDEN visibility support if available." ON)
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckCXXCompilerFlag.cmake | 1 +
Modules/GenerateExportHeader.cmake | 25 ++++++++++++++++++-
.../GenerateExportHeader/exportheader_test.cpp | 2 +-
3 files changed, 25 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list