[Cmake-commits] CMake branch, next, updated. v2.8.11-2371-g0036b8a

[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  0036b8afa955fffe431d4184eb5f0e85493d08ed (commit)
       via  b1be061cdfef754557a5041acf57dc2acf357d65 (commit)
      from  d6c6a71afc5ecffe9314a677ed099b55a9117588 (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=0036b8afa955fffe431d4184eb5f0e85493d08ed
commit 0036b8afa955fffe431d4184eb5f0e85493d08ed
Merge: d6c6a71 b1be061
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 31 03:22:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 31 03:22:00 2013 -0400

    Merge topic 'VISIBILITY_PRESET-property' into next
    
    b1be061 Move the condition for running the visibility check up.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1be061cdfef754557a5041acf57dc2acf357d65
commit b1be061cdfef754557a5041acf57dc2acf357d65
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 31 09:19:59 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri May 31 09:21:24 2013 +0200

    Move the condition for running the visibility check up.
    
    The RunCMakeTest.cmake is executed in script mode, so
    the COMPILER_VERSION is not defined.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 260a87c..30be228 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -65,7 +65,22 @@ add_RunCMake_test(Languages)
 add_RunCMake_test(ObjectLibrary)
 if(NOT WIN32)
   add_RunCMake_test(PositionIndependentCode)
-  add_RunCMake_test(VisibilityPreset)
+  set(SKIP_VISIBILITY 0)
+  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.2)
+    set(SKIP_VISIBILITY 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_VISIBILITY 1)
+  endif()
+
+  if (NOT SKIP_VISIBILITY)
+    add_RunCMake_test(VisibilityPreset)
+  endif()
 endif()
 add_RunCMake_test(CompatibleInterface)
 
diff --git a/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake b/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
index f7d6599..2d78832 100644
--- a/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
@@ -1,17 +1,3 @@
 include(RunCMake)
 
-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()
+run_cmake(PropertyTypo)

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                      |   17 ++++++++++++++++-
 Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake |   16 +---------------
 2 files changed, 17 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake