[Cmake-commits] CMake branch, next, updated. v2.8.5-1472-ge99c097
Stephen Kelly
steveire at gmail.com
Wed Aug 10 04:46:29 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 e99c097f485d7019cdb944d4ea9ddf6c51d420b0 (commit)
via 6aca0e257be36949299b28cbfa12225269e28a03 (commit)
via d123bce1ebb9ef8406272fece45e44b66b3df11a (commit)
via 3574b759160bc4609fb799862e75a33b25c932e7 (commit)
via c7a937b71258d063bdcd0249b927bcd987ab3273 (commit)
via 3b188c833b1d349dd610d5f5c929804d34b1967f (commit)
via 4718233a37f0180b1716db31df090a3f649e854a (commit)
from dc0397f68014af9b0cac5e267c486d93a0f55703 (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=e99c097f485d7019cdb944d4ea9ddf6c51d420b0
commit e99c097f485d7019cdb944d4ea9ddf6c51d420b0
Merge: dc0397f 6aca0e2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 04:46:26 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 10 04:46:26 2011 -0400
Merge topic 'generate_export_header' into next
6aca0e2 Short-circuit the tests on unsupported compilers.
d123bce Add some debug output.
3574b75 Simplify the compiler feature check
c7a937b Simplify. We already know we have hidden visibility at this point.
3b188c8 Test for features, not specific compilers.
4718233 Remove the fatal_warnings option which is no longer used.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6aca0e257be36949299b28cbfa12225269e28a03
commit 6aca0e257be36949299b28cbfa12225269e28a03
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 10:41:38 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 10:41:38 2011 +0200
Short-circuit the tests on unsupported compilers.
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 4570280..52fe79f 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -88,6 +88,12 @@ include(GenerateExportHeader)
add_compiler_export_flags()
+if(NOT ((USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32))
+ message(WARNING "Compiler does not support export feature")
+ return()
+endif()
+
+
if (MSVC)
add_definitions(-DCOMPILER_IS_MSVC)
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d123bce1ebb9ef8406272fece45e44b66b3df11a
commit d123bce1ebb9ef8406272fece45e44b66b3df11a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 10:33:14 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 10:36:24 2011 +0200
Add some debug output.
Hopefully this shows up in continuous test output.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 978a924..7e644b1 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -229,6 +229,7 @@ function(add_compiler_export_flags)
_test_compiler_hidden_visibility()
if(NOT (USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR MINGW)
+ message(WARNING "Compiler doesn't have hidden visibility")
return()
endif()
@@ -242,6 +243,7 @@ function(add_compiler_export_flags)
endif()
if(${_gcc_version} VERSION_LESS "4.2")
+ message(WARNING "GCC version older than 4.2")
return()
endif()
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3574b759160bc4609fb799862e75a33b25c932e7
commit 3574b759160bc4609fb799862e75a33b25c932e7
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 10:32:58 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 10:36:23 2011 +0200
Simplify the compiler feature check
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 6ee7bd7..978a924 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -142,12 +142,10 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
if(WIN32)
set(DEFINE_EXPORT "__declspec(dllexport)")
set(DEFINE_IMPORT "__declspec(dllimport)")
- elseif(CMAKE_COMPILER_IS_GNUCXX OR (${CMAKE_CXX_COMPILER_ID} MATCHES Intel AND UNIX))
- if(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY)
- set(DEFINE_EXPORT "__attribute__((visibility(\"default\")))")
- set(DEFINE_IMPORT "__attribute__((visibility(\"default\")))")
- set(DEFINE_NO_EXPORT "__attribute__((visibility(\"hidden\")))")
- endif()
+ elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY)
+ set(DEFINE_EXPORT "__attribute__((visibility(\"default\")))")
+ set(DEFINE_IMPORT "__attribute__((visibility(\"default\")))")
+ set(DEFINE_NO_EXPORT "__attribute__((visibility(\"hidden\")))")
endif()
endif()
endmacro()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7a937b71258d063bdcd0249b927bcd987ab3273
commit c7a937b71258d063bdcd0249b927bcd987ab3273
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 10:28:15 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 10:28:15 2011 +0200
Simplify. We already know we have hidden visibility at this point.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 73ed5e2..6ee7bd7 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -248,12 +248,10 @@ function(add_compiler_export_flags)
endif()
endif()
- if(USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR)
- set (EXTRA_FLAGS "-fvisibility=hidden")
+ set (EXTRA_FLAGS "-fvisibility=hidden")
- if(COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
- set (EXTRA_FLAGS "${EXTRA_FLAGS} -fvisibility-inlines-hidden")
- endif()
+ if(COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
+ set (EXTRA_FLAGS "${EXTRA_FLAGS} -fvisibility-inlines-hidden")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS}" PARENT_SCOPE)
endfunction()
\ No newline at end of file
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b188c833b1d349dd610d5f5c929804d34b1967f
commit 3b188c833b1d349dd610d5f5c929804d34b1967f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 10:26:16 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 10:26:16 2011 +0200
Test for features, not specific compilers.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 659b32a..73ed5e2 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -228,7 +228,9 @@ endfunction()
function(add_compiler_export_flags)
- if(NOT CMAKE_COMPILER_IS_GNUCXX OR MINGW)
+ _test_compiler_hidden_visibility()
+
+ if(NOT (USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR MINGW)
return()
endif()
@@ -246,8 +248,6 @@ function(add_compiler_export_flags)
endif()
endif()
- _test_compiler_hidden_visibility()
-
if(USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR)
set (EXTRA_FLAGS "-fvisibility=hidden")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4718233a37f0180b1716db31df090a3f649e854a
commit 4718233a37f0180b1716db31df090a3f649e854a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 10:24:04 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 10:24:36 2011 +0200
Remove the fatal_warnings option which is no longer used.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 67a16a9..659b32a 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -232,18 +232,6 @@ function(add_compiler_export_flags)
return()
endif()
- set(options)
- set(oneValueArgs FATAL_WARNINGS)
- set(multiValueArgs)
-
- cmake_parse_arguments(_EGHV "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
- set(MESSAGE_TYPE WARNING)
-
- if(_EGHV_FATAL_WARNINGS)
- set(MESSAGE_TYPE FATAL_ERROR)
- endif()
-
if (CMAKE_COMPILER_IS_GNUCXX)
exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-----------------------------------------------------------------------
Summary of changes:
Modules/GenerateExportHeader.cmake | 38 +++++++---------------
Tests/Module/GenerateExportHeader/CMakeLists.txt | 6 +++
2 files changed, 18 insertions(+), 26 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list