[Cmake-commits] CMake branch, next, updated. v2.8.5-1519-g1d54f70

[Stephen Kelly]

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  1d54f70c806a0b24d2e12babd62f36ac9985622f (commit)
       via  df4615e3380cda2bf29d3dfdcfd26b020a64e707 (commit)
       via  78a6e1c1224bbeb92f44dd681cc914030bbf8c82 (commit)
      from  e4f32022c3506941edc52bf121740a527c7184f8 (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=1d54f70c806a0b24d2e12babd62f36ac9985622f
commit 1d54f70c806a0b24d2e12babd62f36ac9985622f
Merge: e4f3202 df4615e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 11 18:23:46 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 11 18:23:46 2011 -0400

    Merge topic 'generate_export_header' into next
    
    df4615e Add the COMPILER_HAS_DEPRECATED only if it has a declspec variant
    78a6e1c Exclude the XL compiler from the hidden-visibility test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df4615e3380cda2bf29d3dfdcfd26b020a64e707
commit df4615e3380cda2bf29d3dfdcfd26b020a64e707
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 12 00:21:13 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 12 00:23:00 2011 +0200

    Add the COMPILER_HAS_DEPRECATED only if it has a declspec variant
    
    _check_cxx_compiler_attribute does it in the alternative.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 05f36f3..c833a01 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -160,11 +160,10 @@ endmacro()
 macro(_test_compiler_has_deprecated)
   _check_cxx_compiler_attribute("__declspec(deprecated)" COMPILER_HAS_DEPRECATED_DECLSPEC)
   if(COMPILER_HAS_DEPRECATED_DECLSPEC)
-    set(COMPILER_HAS_DEPRECATED ${COMPILER_HAS_DEPRECATED_DECLSPEC})
+    set(COMPILER_HAS_DEPRECATED "${COMPILER_HAS_DEPRECATED_DECLSPEC}" CACHE INTERNAL "Compiler support for a deprecated attribute")
   else()
     _check_cxx_compiler_attribute("__attribute__((__deprecated__))" COMPILER_HAS_DEPRECATED)
   endif()
-  set(COMPILER_HAS_DEPRECATED "${COMPILER_HAS_DEPRECATED}" CACHE INTERNAL "Compiler support for a deprecated attribute")
 endmacro()
 
 set(myDir ${CMAKE_CURRENT_LIST_DIR})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78a6e1c1224bbeb92f44dd681cc914030bbf8c82
commit 78a6e1c1224bbeb92f44dd681cc914030bbf8c82
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 11 18:18:19 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 12 00:18:43 2011 +0200

    Exclude the XL compiler from the hidden-visibility test.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 578d71f..05f36f3 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -146,7 +146,10 @@ macro(_test_compiler_hidden_visibility)
     endif()
   endif()
 
-  if (NOT GCC_TOO_OLD AND NOT WIN32)
+  # 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 "${CMAKE_CXX_COMPILER_ID}" MATCHES XL)
     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/GenerateExportHeader.cmake |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake