[Cmake-commits] CMake branch, next, updated. v2.8.11-2316-g8f7c8f9

Stephen Kelly steveire at gmail.com
Thu May 30 04:25:45 EDT 2013


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  8f7c8f9894a036ed3df6114ecf50dfd3a676d543 (commit)
       via  26f3105aedd345137b7b04889d2e0b2d14a29f8c (commit)
       via  49bec4e5bca8ccfdf45b2acd965d517d7d57aed8 (commit)
       via  408cc20acb5145e0af0cea703fd33951ced9e257 (commit)
      from  6b56f365ce9bf11ef40aca0f93e1eb5142ab56eb (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=8f7c8f9894a036ed3df6114ecf50dfd3a676d543
commit 8f7c8f9894a036ed3df6114ecf50dfd3a676d543
Merge: 6b56f36 26f3105
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 04:25:42 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 30 04:25:42 2013 -0400

    Merge topic 'VISIBILITY_PRESET-property' into next
    
    26f3105 Exclude some platforms which don't have the visibility flag.
    49bec4e Add visibility specifier for clang.
    408cc20 Add missing version check.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26f3105aedd345137b7b04889d2e0b2d14a29f8c
commit 26f3105aedd345137b7b04889d2e0b2d14a29f8c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 10:23:51 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 30 10:24:40 2013 +0200

    Exclude some platforms which don't have the visibility flag.
    
    Confirmed from output from the GenerateExportHeader test or other
    googling.

diff --git a/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake b/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
index 2d78832..f7d6599 100644
--- a/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
@@ -1,3 +1,17 @@
 include(RunCMake)
 
-run_cmake(PropertyTypo)
+set(SKIP_TESTS 0)
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.2)
+  set(SKIP_TESTS 1)
+endif()
+if (CMAKE_CXX_COMPILER_ID MATCHES Watcom
+    OR CMAKE_SYSTEM_NAME MATCHES IRIX64
+    OR CMAKE_CXX_COMPILER_ID MATCHES HP
+    OR CMAKE_CXX_COMPILER_ID MATCHES XL
+    OR CMAKE_CXX_COMPILER_ID MATCHES SunPro)
+  set(SKIP_TESTS 1)
+endif()
+
+if (NOT SKIP_TESTS)
+  run_cmake(PropertyTypo)
+endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49bec4e5bca8ccfdf45b2acd965d517d7d57aed8
commit 49bec4e5bca8ccfdf45b2acd965d517d7d57aed8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 09:59:16 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 30 10:24:40 2013 +0200

    Add visibility specifier for clang.
    
    Because this is wrapped in a version check in the GNU.cmake, it
    needs to be repeated here.

diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index c6cd8f8..ec4562a 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -24,4 +24,5 @@ macro(__compiler_clang lang)
   __compiler_gnu(${lang})
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
   set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
 endmacro()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=408cc20acb5145e0af0cea703fd33951ced9e257
commit 408cc20acb5145e0af0cea703fd33951ced9e257
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 09:56:55 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 30 10:24:40 2013 +0200

    Add missing version check.

diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 9bee962..33d6093 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -2,7 +2,11 @@ include(Compiler/GNU)
 __compiler_gnu(CXX)
 
 if (WIN32)
-  set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fno-keep-inline-dllexport")
+  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+    set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fno-keep-inline-dllexport")
+  endif()
 else()
-  set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
+  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2)
+    set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
+  endif()
 endif()

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

Summary of changes:
 Modules/Compiler/Clang.cmake                       |    1 +
 Modules/Compiler/GNU-CXX.cmake                     |    8 ++++++--
 Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake |   16 +++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list