[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1975-g9c4280c

[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  9c4280c64698b6211fdb284618011320e65a2855 (commit)
       via  f348ae39bb7a244ecfa96de88200c62add90f5e1 (commit)
      from  f691209fc1a5326f4e1c39d9bf4bf839d2952939 (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=9c4280c64698b6211fdb284618011320e65a2855
commit 9c4280c64698b6211fdb284618011320e65a2855
Merge: f691209 f348ae3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 12:03:56 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 6 12:03:56 2014 -0400

    Merge topic 'MSVC-features' into next
    
    f348ae39 Run CompileFeatures test with MSVC, Clang


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f348ae39bb7a244ecfa96de88200c62add90f5e1
commit f348ae39bb7a244ecfa96de88200c62add90f5e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 18:03:01 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 6 18:03:01 2014 +0200

    Run CompileFeatures test with MSVC, Clang
    
    Port it to test cxx_auto_type.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9373858..3d00c31 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -197,8 +197,12 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(TarTest TarTest)
   ADD_TEST_MACRO(SystemInformation SystemInformation)
   ADD_TEST_MACRO(MathTest MathTest)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL GNU
+  if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
       AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+      OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
+      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+      OR (CMAKE_CXX_COMPILER_ID STREQUAL MSVC
+      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1600))
     ADD_TEST_MACRO(CompileFeatures CompileFeatures)
   endif()
   # assume no resources building to test
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 6edb355..14bad11 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -31,17 +31,17 @@ endif()
 
 add_executable(CompileFeatures main.cpp)
 set_property(TARGET CompileFeatures
-  PROPERTY COMPILE_FEATURES "cxx_delegating_constructors"
+  PROPERTY COMPILE_FEATURES "cxx_auto_type"
 )
 
 add_executable(GenexCompileFeatures main.cpp)
 set_property(TARGET GenexCompileFeatures
-  PROPERTY COMPILE_FEATURES "$<1:cxx_delegating_constructors>;$<0:not_a_feature>"
+  PROPERTY COMPILE_FEATURES "$<1:cxx_auto_type>;$<0:not_a_feature>"
 )
 
 add_library(iface INTERFACE)
 set_property(TARGET iface
-  PROPERTY INTERFACE_COMPILE_FEATURES "cxx_delegating_constructors"
+  PROPERTY INTERFACE_COMPILE_FEATURES "cxx_auto_type"
 )
 add_executable(IfaceCompileFeatures main.cpp)
 target_link_libraries(IfaceCompileFeatures iface)
diff --git a/Tests/CompileFeatures/main.cpp b/Tests/CompileFeatures/main.cpp
index 6fd8f0f..3a8e0fc 100644
--- a/Tests/CompileFeatures/main.cpp
+++ b/Tests/CompileFeatures/main.cpp
@@ -1,20 +1,6 @@
 
-class Foo
-{
-public:
-  Foo(int i);
-
-  Foo(double d)
-    : Foo(static_cast<int>(d))
-  {
-
-  }
-
-private:
-  int m_i;
-};
-
 int main(int,char**)
 {
-  return 0;
+  auto value = 0;
+  return value;
 }

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

Summary of changes:
 Tests/CMakeLists.txt                 |    6 +++++-
 Tests/CompileFeatures/CMakeLists.txt |    6 +++---
 Tests/CompileFeatures/main.cpp       |   18 ++----------------
 3 files changed, 10 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
CMake