[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1999-g89f5235

[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  89f523544f368c21b695c3bc93c948ec093dace4 (commit)
       via  3e04da94d979cbab18a53cf715b5644719249da9 (commit)
      from  52ca9d605e7298001486f7ce163c8b71d4952f7c (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=89f523544f368c21b695c3bc93c948ec093dace4
commit 89f523544f368c21b695c3bc93c948ec093dace4
Merge: 52ca9d6 3e04da9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 03:03:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 7 03:03:46 2014 -0400

    Merge topic 'MSVC-features' into next
    
    3e04da94 Narrow platforms.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e04da94d979cbab18a53cf715b5644719249da9
commit 3e04da94d979cbab18a53cf715b5644719249da9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 09:02:51 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 7 09:02:51 2014 +0200

    Narrow platforms.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e5adadf..505caac 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -198,7 +198,7 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(SystemInformation SystemInformation)
   ADD_TEST_MACRO(MathTest MathTest)
   if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
-        AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+        AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
       OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
         AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
       OR ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 71bc3b6..b4b4ef9 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -3,6 +3,17 @@ cmake_minimum_required(VERSION 3.0)
 
 project(CompileFeatures)
 
+message(STATUS "CTEST_FULL_OUTPUT")
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
+  message("Skipping for AppleClang")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
+    "int main(int,char**) { return 0; }\n"
+  )
+  add_executable(CompileFeatures "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
+  return()
+endif()
+
 macro(run_test feature)
   if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ${feature})
     add_library(test_${feature} OBJECT ${feature}.cpp)

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

Summary of changes:
 Tests/CMakeLists.txt                 |    2 +-
 Tests/CompileFeatures/CMakeLists.txt |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake