[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-446-g870d434

[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  870d4341f25524a1c58a25e2289f8c00ed584845 (commit)
       via  d3f9a669e35cd7002bc481e04580bd26189e438c (commit)
      from  172a21790ba117af6a03e35c69213a89a5cb86f3 (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=870d4341f25524a1c58a25e2289f8c00ed584845
commit 870d4341f25524a1c58a25e2289f8c00ed584845
Merge: 172a217 d3f9a66
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 12 02:32:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 12 02:32:46 2015 -0400

    Merge topic 'fix-tests-ancient-policies' into next
    
    d3f9a669 Revert "Tests: Update the complex test for ancient policies."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3f9a669e35cd7002bc481e04580bd26189e438c
commit d3f9a669e35cd7002bc481e04580bd26189e438c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 12 08:32:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jun 12 08:32:22 2015 +0200

    Revert "Tests: Update the complex test for ancient policies."
    
    This reverts commit 3159f3e09f9a7b241bc09c587a16b4ae0c402c51.

diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 1479a13..5e5eead 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # A more complex test case
 #
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 2.4)
 project (Complex)
 
 # Try setting a new policy.  The IF test is for coverage.
@@ -21,7 +21,6 @@ foreach(p
     CMP0032
     CMP0033
     CMP0034
-    CMP0035
     CMP0043
     CMP0050
     )
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index 9dccd84..ec222a5 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -838,6 +838,14 @@ int main()
 #endif
 #endif // defined(_WIN32) && !defined(__CYGWIN__)
 
+  if(strcmp(CMAKE_MINIMUM_REQUIRED_VERSION, "2.4") == 0)
+    {
+    cmPassed("CMAKE_MINIMUM_REQUIRED_VERSION is set to 2.4");
+    }
+  else
+    {
+    cmFailed("CMAKE_MINIMUM_REQUIRED_VERSION is not set to the expected 2.4");
+    }
 
   // ----------------------------------------------------------------------
   // Test REMOVE command
diff --git a/Tests/Complex/Library/test_preprocess.cmake b/Tests/Complex/Library/test_preprocess.cmake
index 5758ba8..4c8ec21 100644
--- a/Tests/Complex/Library/test_preprocess.cmake
+++ b/Tests/Complex/Library/test_preprocess.cmake
@@ -1,4 +1,4 @@
-set(TEST_FILE CMakeFiles/create_file.dir/create_file.cxx.i)
+set(TEST_FILE CMakeFiles/create_file.dir/create_file.i)
 file(READ ${TEST_FILE} CONTENTS)
 if("${CONTENTS}" MATCHES "Unable to close")
   message(STATUS "${TEST_FILE} created successfully!")
diff --git a/Tests/ComplexOneConfig/Library/test_preprocess.cmake b/Tests/ComplexOneConfig/Library/test_preprocess.cmake
index 5758ba8..4c8ec21 100644
--- a/Tests/ComplexOneConfig/Library/test_preprocess.cmake
+++ b/Tests/ComplexOneConfig/Library/test_preprocess.cmake
@@ -1,4 +1,4 @@
-set(TEST_FILE CMakeFiles/create_file.dir/create_file.cxx.i)
+set(TEST_FILE CMakeFiles/create_file.dir/create_file.i)
 file(READ ${TEST_FILE} CONTENTS)
 if("${CONTENTS}" MATCHES "Unable to close")
   message(STATUS "${TEST_FILE} created successfully!")

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

Summary of changes:
 Tests/Complex/CMakeLists.txt                         |    3 +--
 Tests/Complex/Executable/complex.cxx                 |    8 ++++++++
 Tests/Complex/Library/test_preprocess.cmake          |    2 +-
 Tests/ComplexOneConfig/Library/test_preprocess.cmake |    2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake