[Cmake-commits] CMake branch, next, updated. v2.8.5-1508-gcfd6e90

[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  cfd6e907c41882b87b18dd2822d802229e3926b3 (commit)
       via  399f415b1558397e51502914ae36b6d055668eeb (commit)
      from  476ecd3b68f6b6d00d67d9c54217ada7be1f2ba2 (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=cfd6e907c41882b87b18dd2822d802229e3926b3
commit cfd6e907c41882b87b18dd2822d802229e3926b3
Merge: 476ecd3 399f415
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 11 04:30:37 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 11 04:30:37 2011 -0400

    Merge topic 'generate_export_header' into next
    
    399f415 Only set the deprecated attribute if hidden visibilty is enabled.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=399f415b1558397e51502914ae36b6d055668eeb
commit 399f415b1558397e51502914ae36b6d055668eeb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 11 10:28:50 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 11 10:28:50 2011 +0200

    Only set the deprecated attribute if hidden visibilty is enabled.
    
    This is what is tested in the unit test. If it makes sense, another
    option can be added later.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 9dd8f4a..0b93941 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -155,7 +155,9 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
       set(DEFINE_DEPRECATED "__declspec(deprecated)")
     endif()
   else()
-    set(DEFINE_DEPRECATED "__attribute__ ((__deprecated__))")
+    if(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY)
+      set(DEFINE_DEPRECATED "__attribute__ ((__deprecated__))")
+    endif()
   endif()
 
   get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)

-----------------------------------------------------------------------

Summary of changes:
 Modules/GenerateExportHeader.cmake |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake