[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-451-g3d1166d
Stephen Kelly
steveire at gmail.com
Sat Jun 13 02:27:01 EDT 2015
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 3d1166d1f8f61da181e3374c4b900a0fa2604035 (commit)
via 7a57d3615f4020783e44f06c3aad4b24dbc342d3 (commit)
from 0753c59f4551e65b9f6d422def093f55da338ad9 (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=3d1166d1f8f61da181e3374c4b900a0fa2604035
commit 3d1166d1f8f61da181e3374c4b900a0fa2604035
Merge: 0753c59 7a57d36
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 13 02:26:59 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 13 02:26:59 2015 -0400
Merge topic 'fix-tests-ancient-policies' into next
7a57d361 Revert topic.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a57d3615f4020783e44f06c3aad4b24dbc342d3
commit 7a57d3615f4020783e44f06c3aad4b24dbc342d3
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 13 08:25:04 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jun 13 08:26:08 2015 +0200
Revert topic.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index fabaa6c..8865063 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -347,6 +347,9 @@ 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/CMakeTests/FileTestScript.cmake b/Tests/CMakeTests/FileTestScript.cmake
index a243aa6..9a43569 100644
--- a/Tests/CMakeTests/FileTestScript.cmake
+++ b/Tests/CMakeTests/FileTestScript.cmake
@@ -73,7 +73,7 @@ elseif(testname STREQUAL glob_recurse_relative_no_expression) # fail
file(GLOB_RECURSE v RELATIVE dddd)
elseif(testname STREQUAL glob_non_full_path) # pass
- file(GLOB_RECURSE v FOLLOW_SYMLINKS ffff*.*)
+ file(GLOB_RECURSE v ffff*.*)
message("v='${v}'")
elseif(testname STREQUAL make_directory_non_full_path) # pass
diff --git a/Tests/CPackComponents/CMakeLists.txt b/Tests/CPackComponents/CMakeLists.txt
index c676acc..1cb8669 100644
--- a/Tests/CPackComponents/CMakeLists.txt
+++ b/Tests/CPackComponents/CMakeLists.txt
@@ -79,7 +79,7 @@ set(CPACK_NSIS_MENU_LINKS
)
# Suggested default root for end users of the installer:
-set(CPACK_NSIS_INSTALL_ROOT "C:\\\\Program Files\\\\CMake Tests Install Root")
+set(CPACK_NSIS_INSTALL_ROOT "C:\\Program Files\\CMake Tests Install Root")
# Include CPack to introduce the appropriate targets
include(CPack)
diff --git a/Tests/EmptyProperty/CMakeLists.txt b/Tests/EmptyProperty/CMakeLists.txt
index 65aa216..39e75f3 100644
--- a/Tests/EmptyProperty/CMakeLists.txt
+++ b/Tests/EmptyProperty/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required (VERSION 3.3)
project (EmptyProperty)
set_property(DIRECTORY APPEND
diff --git a/Tests/ExternalOBJ/CMakeLists.txt b/Tests/ExternalOBJ/CMakeLists.txt
index 64620a5..458c88b 100644
--- a/Tests/ExternalOBJ/CMakeLists.txt
+++ b/Tests/ExternalOBJ/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.3)
+cmake_minimum_required (VERSION 2.6)
project (ExternalOBJ)
if(APPLE)
diff --git a/Tests/LibName/CMakeLists.txt b/Tests/LibName/CMakeLists.txt
index eedd9ec..3ac125f 100644
--- a/Tests/LibName/CMakeLists.txt
+++ b/Tests/LibName/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.3)
project(LibName)
# this is a test to make sure that relative path
# LIBRARY_OUTPUT_PATH and EXECUTABLE_OUTPUT_PATH work
diff --git a/Tests/LinkLine/CMakeLists.txt b/Tests/LinkLine/CMakeLists.txt
index d14c963..6154dd4 100644
--- a/Tests/LinkLine/CMakeLists.txt
+++ b/Tests/LinkLine/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required (VERSION 3.3)
project( LinkLine )
# Makes sure that the library order as specified by the user are
diff --git a/Tests/Policy0002/A/CMakeLists.txt b/Tests/Policy0002/A/CMakeLists.txt
new file mode 100644
index 0000000..cee6422
--- /dev/null
+++ b/Tests/Policy0002/A/CMakeLists.txt
@@ -0,0 +1 @@
+add_executable(Policy0002 ../policy0002.c)
diff --git a/Tests/Policy0002/CMakeLists.txt b/Tests/Policy0002/CMakeLists.txt
new file mode 100644
index 0000000..0f6d331
--- /dev/null
+++ b/Tests/Policy0002/CMakeLists.txt
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..8488f4e
--- /dev/null
+++ b/Tests/Policy0002/policy0002.c
@@ -0,0 +1,4 @@
+int main(void)
+{
+ return 0;
+}
diff --git a/Tests/PolicyScope/Bar.cmake b/Tests/PolicyScope/Bar.cmake
index 2f94d8d..cf1904c 100644
--- a/Tests/PolicyScope/Bar.cmake
+++ b/Tests/PolicyScope/Bar.cmake
@@ -1,5 +1,8 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 2.6.3)
# Make sure a policy set differently by our includer is now correct.
-cmake_policy(GET CMP0056 cmp)
-check(CMP0056 "NEW" "${cmp}")
+cmake_policy(GET CMP0003 cmp)
+check(CMP0003 "NEW" "${cmp}")
+
+# Test allowing the top-level file to not have cmake_minimum_required.
+cmake_policy(SET CMP0000 OLD)
diff --git a/Tests/PolicyScope/CMakeLists.txt b/Tests/PolicyScope/CMakeLists.txt
index b14c423..413195a 100644
--- a/Tests/PolicyScope/CMakeLists.txt
+++ b/Tests/PolicyScope/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
project(PolicyScope C)
# No cmake_minimum_required(VERSION), it's in FindFoo.
@@ -13,27 +12,33 @@ endfunction()
#-----------------------------------------------------------------------------
# Test using a development framework that sets policies for us.
+# Policy CMP0011 should not be set at this point.
+cmake_policy(GET CMP0011 cmp)
+check(CMP0011 "" "${cmp}")
+
# Put the test modules in the search path.
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
# The included file should set policies for us.
-find_package(Foo NO_POLICY_SCOPE)
+find_package(Foo)
# Check policies set by the package.
-cmake_policy(GET CMP0056 cmp)
-check(CMP0056 "OLD" "${cmp}")
-cmake_policy(GET CMP0055 cmp)
-check(CMP0055 "NEW" "${cmp}")
+cmake_policy(GET CMP0003 cmp)
+check(CMP0003 "OLD" "${cmp}")
+cmake_policy(GET CMP0002 cmp)
+check(CMP0002 "NEW" "${cmp}")
+cmake_policy(GET CMP0011 cmp)
+check(CMP0011 "NEW" "${cmp}")
# Make sure an included file cannot change policies.
include(Bar)
-cmake_policy(GET CMP0056 cmp)
-check(CMP0056 "OLD" "${cmp}")
+cmake_policy(GET CMP0003 cmp)
+check(CMP0003 "OLD" "${cmp}")
# Allow the included file to change policies.
include(Bar NO_POLICY_SCOPE)
-cmake_policy(GET CMP0056 cmp)
-check(CMP0056 "NEW" "${cmp}")
+cmake_policy(GET CMP0003 cmp)
+check(CMP0003 "NEW" "${cmp}")
#-----------------------------------------------------------------------------
# Test function and macro policy recording.
@@ -41,56 +46,57 @@ check(CMP0056 "NEW" "${cmp}")
# Create the functions in an isolated scope in which we change policies.
cmake_policy(PUSH)
if(1)
- cmake_policy(SET CMP0055 OLD)
+ # Change CMP0002
+ cmake_policy(SET CMP0002 OLD)
function(func1)
- # CMP0055 should be changed when this function is invoked
- cmake_policy(GET CMP0055 cmp)
- check(CMP0055 "OLD" "${cmp}")
+ # CMP0002 should be changed when this function is invoked
+ cmake_policy(GET CMP0002 cmp)
+ check(CMP0002 "OLD" "${cmp}")
endfunction()
- # Unset CMP0055
- cmake_policy(VERSION 3.1)
+ # Unset CMP0002
+ cmake_policy(VERSION 2.4)
macro(macro1)
- # CMP0055 should be unset when this macro is invoked
- cmake_policy(GET CMP0055 cmp)
- check(CMP0055 "" "${cmp}")
+ # CMP0002 should be unset when this macro is invoked
+ cmake_policy(GET CMP0002 cmp)
+ check(CMP0002 "" "${cmp}")
# Setting the policy should work here and also in the caller.
- cmake_policy(SET CMP0055 OLD)
- cmake_policy(GET CMP0055 cmp)
- check(CMP0055 "OLD" "${cmp}")
+ cmake_policy(SET CMP0002 OLD)
+ cmake_policy(GET CMP0002 cmp)
+ check(CMP0002 "OLD" "${cmp}")
endmacro()
endif()
cmake_policy(POP)
-# CMP0055 should still be NEW in this context.
-cmake_policy(GET CMP0055 cmp)
-check(CMP0055 "NEW" "${cmp}")
+# CMP0002 should still be NEW in this context.
+cmake_policy(GET CMP0002 cmp)
+check(CMP0002 "NEW" "${cmp}")
# Check the recorded policies
func1()
macro1()
-# The macro should have changed CMP0055.
-cmake_policy(GET CMP0055 cmp)
-check(CMP0055 "OLD" "${cmp}")
+# The macro should have changed CMP0002.
+cmake_policy(GET CMP0002 cmp)
+check(CMP0002 "OLD" "${cmp}")
#-----------------------------------------------------------------------------
# Test CMAKE_POLICY_DEFAULT_CMP<NNNN> variable.
cmake_policy(PUSH)
- set(CMAKE_POLICY_DEFAULT_CMP0054 OLD) # ignored
- set(CMAKE_POLICY_DEFAULT_CMP0055 OLD) # honored
- set(CMAKE_POLICY_DEFAULT_CMP0056 NEW) # honored
- set(CMAKE_POLICY_DEFAULT_CMP0057 "") # noop
- cmake_policy(VERSION 3.1)
- cmake_policy(GET CMP0054 cmp)
- check(CMP0054 "NEW" "${cmp}")
- cmake_policy(GET CMP0055 cmp)
- check(CMP0055 "OLD" "${cmp}")
- cmake_policy(GET CMP0056 cmp)
- check(CMP0056 "NEW" "${cmp}")
- cmake_policy(GET CMP0057 cmp)
- check(CMP0057 "" "${cmp}")
+ set(CMAKE_POLICY_DEFAULT_CMP0010 OLD) # ignored
+ set(CMAKE_POLICY_DEFAULT_CMP0012 OLD) # honored
+ set(CMAKE_POLICY_DEFAULT_CMP0013 NEW) # honored
+ set(CMAKE_POLICY_DEFAULT_CMP0014 "") # noop
+ cmake_policy(VERSION 2.6.3)
+ cmake_policy(GET CMP0010 cmp)
+ check(CMP0010 "NEW" "${cmp}")
+ cmake_policy(GET CMP0012 cmp)
+ check(CMP0012 "OLD" "${cmp}")
+ cmake_policy(GET CMP0013 cmp)
+ check(CMP0013 "NEW" "${cmp}")
+ cmake_policy(GET CMP0014 cmp)
+ check(CMP0014 "" "${cmp}")
cmake_policy(POP)
#-----------------------------------------------------------------------------
diff --git a/Tests/PolicyScope/FindFoo.cmake b/Tests/PolicyScope/FindFoo.cmake
index 3f9ac8e..5b441e2 100644
--- a/Tests/PolicyScope/FindFoo.cmake
+++ b/Tests/PolicyScope/FindFoo.cmake
@@ -1,2 +1,2 @@
-cmake_minimum_required(VERSION 3.2)
-cmake_policy(SET CMP0056 OLD)
+cmake_minimum_required(VERSION 2.6.3)
+cmake_policy(SET CMP0003 OLD)
diff --git a/Tests/PreOrder/CMakeLists.txt b/Tests/PreOrder/CMakeLists.txt
index a688c74..8b4c439 100644
--- a/Tests/PreOrder/CMakeLists.txt
+++ b/Tests/PreOrder/CMakeLists.txt
@@ -1,5 +1,4 @@
# a simple test case
-cmake_minimum_required (VERSION 3.3)
project (PreOrder)
set(CMAKE_IGNORE_DEPENDENCIES_ORDERING 1)
add_subdirectory(Library)
diff --git a/Tests/SBCS/CMakeLists.txt b/Tests/SBCS/CMakeLists.txt
index 7a77711..b3c3c2c 100644
--- a/Tests/SBCS/CMakeLists.txt
+++ b/Tests/SBCS/CMakeLists.txt
@@ -1,5 +1,4 @@
# a SBCS test case
-cmake_minimum_required (VERSION 3.3)
project (SBCS)
add_definitions(-D_SBCS)
diff --git a/Tests/Simple/CMakeLists.txt b/Tests/Simple/CMakeLists.txt
index 79ff071..a951c2d 100644
--- a/Tests/Simple/CMakeLists.txt
+++ b/Tests/Simple/CMakeLists.txt
@@ -1,5 +1,4 @@
# a simple test case
-cmake_minimum_required (VERSION 3.3)
project (Simple)
add_executable (Simple simple.cxx)
diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index 8caa2f0..faf3bc9 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.3)
+cmake_minimum_required (VERSION 2.6)
project(StringFileTest)
include_directories(${StringFileTest_BINARY_DIR})
diff --git a/Tests/VSExternalInclude/CMakeLists.txt b/Tests/VSExternalInclude/CMakeLists.txt
index 926caea..73ea05a 100644
--- a/Tests/VSExternalInclude/CMakeLists.txt
+++ b/Tests/VSExternalInclude/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.3)
+cmake_minimum_required (VERSION 2.6)
project(VSExternalInclude)
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
diff --git a/Tests/VSExternalInclude/Lib1/CMakeLists.txt b/Tests/VSExternalInclude/Lib1/CMakeLists.txt
index 0d08853..9dfac86 100644
--- a/Tests/VSExternalInclude/Lib1/CMakeLists.txt
+++ b/Tests/VSExternalInclude/Lib1/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required (VERSION 3.3)
set(CMAKE_SUPPRESS_REGENERATION 1)
project(LIB1)
diff --git a/Tests/VSExternalInclude/Lib2/CMakeLists.txt b/Tests/VSExternalInclude/Lib2/CMakeLists.txt
index 017b8fe..f451354 100644
--- a/Tests/VSExternalInclude/Lib2/CMakeLists.txt
+++ b/Tests/VSExternalInclude/Lib2/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required (VERSION 3.3)
set(CMAKE_SUPPRESS_REGENERATION 1)
project(VSEXTERNAL_LIB2)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 3 +
Tests/CMakeTests/FileTestScript.cmake | 2 +-
Tests/CPackComponents/CMakeLists.txt | 2 +-
Tests/EmptyProperty/CMakeLists.txt | 1 -
Tests/ExternalOBJ/CMakeLists.txt | 2 +-
Tests/LibName/CMakeLists.txt | 1 -
Tests/LinkLine/CMakeLists.txt | 1 -
Tests/Policy0002/A/CMakeLists.txt | 1 +
Tests/Policy0002/CMakeLists.txt | 5 ++
.../subdir/main.c => Policy0002/policy0002.c} | 0
Tests/PolicyScope/Bar.cmake | 9 +-
Tests/PolicyScope/CMakeLists.txt | 88 +++++++++++---------
Tests/PolicyScope/FindFoo.cmake | 4 +-
Tests/PreOrder/CMakeLists.txt | 1 -
Tests/SBCS/CMakeLists.txt | 1 -
Tests/Simple/CMakeLists.txt | 1 -
Tests/StringFileTest/CMakeLists.txt | 2 +-
Tests/VSExternalInclude/CMakeLists.txt | 2 +-
Tests/VSExternalInclude/Lib1/CMakeLists.txt | 1 -
Tests/VSExternalInclude/Lib2/CMakeLists.txt | 1 -
20 files changed, 69 insertions(+), 59 deletions(-)
create mode 100644 Tests/Policy0002/A/CMakeLists.txt
create mode 100644 Tests/Policy0002/CMakeLists.txt
copy Tests/{CTestTestSubdir/subdir/main.c => Policy0002/policy0002.c} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list