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 7855f91d3195cfa79809b807d172f23610b0b18c (commit) via b2013981aa08e41ee8e122835d592a0aa297e1ff (commit) via 681a35f22fc69811e87132232b911d4d8b4f27a9 (commit) via f30c8d2b441a79c6198be95de9ec5f550d64639e (commit) via 83fff0acbf438666c430257a3ec59c7d9ba5c415 (commit) from 3e1342f66a7e77baeced473728b4c87edc2bf338 (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=7855f91d3195cfa79809b807d172f23610b0b18c commit 7855f91d3195cfa79809b807d172f23610b0b18c Merge: 3e1342f b201398 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Tue Jun 9 19:28:53 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Jun 9 19:28:53 2015 -0400 Merge topic 'fail-on-ancient-policies' into next b2013981 fixup! Tests: Update the minimum required cmake version. 681a35f2 Tests: Update the complex test for ancient policies. f30c8d2b fixup! Tests: Update the minimum required cmake version. 83fff0ac fixup! Tests: Implement PolicyScope tests in terms of newer policies. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2013981aa08e41ee8e122835d592a0aa297e1ff commit b2013981aa08e41ee8e122835d592a0aa297e1ff Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Jun 10 01:28:25 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Jun 10 01:28:25 2015 +0200 fixup! Tests: Update the minimum required cmake version. diff --git a/Tests/SBCS/CMakeLists.txt b/Tests/SBCS/CMakeLists.txt index b3c3c2c..7a77711 100644 --- a/Tests/SBCS/CMakeLists.txt +++ b/Tests/SBCS/CMakeLists.txt @@ -1,4 +1,5 @@ # a SBCS test case +cmake_minimum_required (VERSION 3.3) project (SBCS) add_definitions(-D_SBCS) diff --git a/Tests/VSExternalInclude/CMakeLists.txt b/Tests/VSExternalInclude/CMakeLists.txt index 73ea05a..926caea 100644 --- a/Tests/VSExternalInclude/CMakeLists.txt +++ b/Tests/VSExternalInclude/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.6) +cmake_minimum_required (VERSION 3.3) project(VSExternalInclude) if(${CMAKE_GENERATOR} MATCHES "Visual Studio 6") http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=681a35f22fc69811e87132232b911d4d8b4f27a9 commit 681a35f22fc69811e87132232b911d4d8b4f27a9 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Jun 10 01:25:50 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Jun 10 01:26:49 2015 +0200 Tests: Update the complex test for ancient policies. diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index 5e5eead..1479a13 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -1,7 +1,7 @@ # # A more complex test case # -cmake_minimum_required(VERSION 2.4) +cmake_minimum_required(VERSION 3.2) project (Complex) # Try setting a new policy. The IF test is for coverage. @@ -21,6 +21,7 @@ foreach(p CMP0032 CMP0033 CMP0034 + CMP0035 CMP0043 CMP0050 ) diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index ec222a5..9dccd84 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -838,14 +838,6 @@ 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 4c8ec21..5758ba8 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.i) +set(TEST_FILE CMakeFiles/create_file.dir/create_file.cxx.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 4c8ec21..5758ba8 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.i) +set(TEST_FILE CMakeFiles/create_file.dir/create_file.cxx.i) file(READ ${TEST_FILE} CONTENTS) if("${CONTENTS}" MATCHES "Unable to close") message(STATUS "${TEST_FILE} created successfully!") http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f30c8d2b441a79c6198be95de9ec5f550d64639e commit f30c8d2b441a79c6198be95de9ec5f550d64639e Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Jun 10 01:12:13 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Jun 10 01:12:13 2015 +0200 fixup! Tests: Update the minimum required cmake version. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 8865063..fabaa6c 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -347,9 +347,6 @@ if(BUILD_TESTING) ADD_TEST_MACRO(CrossCompile CrossCompile) set_tests_properties(CrossCompile PROPERTIES PASS_REGULAR_EXPRESSION "TRY_RUN.. invoked in cross-compiling mode") - if("${CMAKE_GENERATOR}" MATCHES "Make") - ADD_TEST_MACRO(Policy0002 Policy0002) - endif() if(CTEST_TEST_OSX_ARCH) ADD_TEST_MACRO(Architecture Architecture) set_tests_properties(Architecture PROPERTIES diff --git a/Tests/Policy0002/A/CMakeLists.txt b/Tests/Policy0002/A/CMakeLists.txt deleted file mode 100644 index cee6422..0000000 --- a/Tests/Policy0002/A/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_executable(Policy0002 ../policy0002.c) diff --git a/Tests/Policy0002/CMakeLists.txt b/Tests/Policy0002/CMakeLists.txt deleted file mode 100644 index 0f6d331..0000000 --- a/Tests/Policy0002/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -project(Policy0002 C) -cmake_policy(SET CMP0002 OLD) -add_subdirectory(A) -add_executable(Policy0002 policy0002.c) diff --git a/Tests/Policy0002/policy0002.c b/Tests/Policy0002/policy0002.c deleted file mode 100644 index 8488f4e..0000000 --- a/Tests/Policy0002/policy0002.c +++ /dev/null @@ -1,4 +0,0 @@ -int main(void) -{ - return 0; -} http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83fff0acbf438666c430257a3ec59c7d9ba5c415 commit 83fff0acbf438666c430257a3ec59c7d9ba5c415 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Jun 10 01:10:43 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Jun 10 01:10:43 2015 +0200 fixup! Tests: Implement PolicyScope tests in terms of newer policies. diff --git a/Tests/PolicyScope/CMakeLists.txt b/Tests/PolicyScope/CMakeLists.txt index 5cf302e..b14c423 100644 --- a/Tests/PolicyScope/CMakeLists.txt +++ b/Tests/PolicyScope/CMakeLists.txt @@ -82,7 +82,7 @@ cmake_policy(PUSH) set(CMAKE_POLICY_DEFAULT_CMP0055 OLD) # honored set(CMAKE_POLICY_DEFAULT_CMP0056 NEW) # honored set(CMAKE_POLICY_DEFAULT_CMP0057 "") # noop - cmake_policy(VERSION 3.2) + cmake_policy(VERSION 3.1) cmake_policy(GET CMP0054 cmp) check(CMP0054 "NEW" "${cmp}") cmake_policy(GET CMP0055 cmp) ----------------------------------------------------------------------- Summary of changes: Tests/CMakeLists.txt | 3 --- 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 +- Tests/Policy0002/A/CMakeLists.txt | 1 - Tests/Policy0002/CMakeLists.txt | 5 ----- Tests/Policy0002/policy0002.c | 4 ---- Tests/PolicyScope/CMakeLists.txt | 2 +- Tests/SBCS/CMakeLists.txt | 1 + Tests/VSExternalInclude/CMakeLists.txt | 2 +- 11 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 Tests/Policy0002/A/CMakeLists.txt delete mode 100644 Tests/Policy0002/CMakeLists.txt delete mode 100644 Tests/Policy0002/policy0002.c hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits