[Cmake-commits] CMake branch, next, updated. v3.4.0-1503-ga235861
Brad King
brad.king at kitware.com
Tue Nov 24 14:00:53 EST 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 a2358610481fa1206418d43bbc95aaeda3f54816 (commit)
via d8dd2a7aa7f94982975fd1786dfcc0203ccc8428 (commit)
from 257e7438abb7a536dd59c5e85a5ab5b7c74873a2 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2358610481fa1206418d43bbc95aaeda3f54816
commit a2358610481fa1206418d43bbc95aaeda3f54816
Merge: 257e743 d8dd2a7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 24 14:00:52 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 24 14:00:52 2015 -0500
Merge topic 'test-cmake_policy-unmatched' into next
d8dd2a7a Revert "Tests: Add case for package version file unmatched policy scope"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8dd2a7aa7f94982975fd1786dfcc0203ccc8428
commit d8dd2a7aa7f94982975fd1786dfcc0203ccc8428
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 24 14:00:32 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 24 14:00:32 2015 -0500
Revert "Tests: Add case for package version file unmatched policy scope"
This reverts commit b0e539efd846e166441cf219029daae363ffacaa.
diff --git a/Tests/RunCMake/find_package/PolicyPop-result.txt b/Tests/RunCMake/find_package/PolicyPop-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/find_package/PolicyPop-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/find_package/PolicyPop-stderr.txt b/Tests/RunCMake/find_package/PolicyPop-stderr.txt
deleted file mode 100644
index 745d39a..0000000
--- a/Tests/RunCMake/find_package/PolicyPop-stderr.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-^CMake Error at PolicyPop/PolicyPopConfigVersion.cmake:3 \(cmake_policy\):
- cmake_policy POP without matching PUSH
-Call Stack \(most recent call first\):
- PolicyPop.cmake:1 \(find_package\)
- CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/find_package/PolicyPop.cmake b/Tests/RunCMake/find_package/PolicyPop.cmake
deleted file mode 100644
index 4866f24..0000000
--- a/Tests/RunCMake/find_package/PolicyPop.cmake
+++ /dev/null
@@ -1 +0,0 @@
-find_package(PolicyPop 1 CONFIG PATHS ${CMAKE_CURRENT_SOURCE_DIR}/PolicyPop NO_DEFAULT_PATH)
diff --git a/Tests/RunCMake/find_package/PolicyPop/PolicyPopConfig.cmake b/Tests/RunCMake/find_package/PolicyPop/PolicyPopConfig.cmake
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake b/Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake
deleted file mode 100644
index 483fb10..0000000
--- a/Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(PACKAGE_VERSION 1)
-set(PACKAGE_VERSION_COMPATIBLE 1)
-cmake_policy(POP)
diff --git a/Tests/RunCMake/find_package/PolicyPush-result.txt b/Tests/RunCMake/find_package/PolicyPush-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/find_package/PolicyPush-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/find_package/PolicyPush-stderr.txt b/Tests/RunCMake/find_package/PolicyPush-stderr.txt
deleted file mode 100644
index 1afcb16..0000000
--- a/Tests/RunCMake/find_package/PolicyPush-stderr.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-^CMake Error at PolicyPush/PolicyPushConfigVersion.cmake:1 \(find_package\):
- cmake_policy PUSH without matching POP
-Call Stack \(most recent call first\):
- PolicyPush.cmake:1 \(find_package\)
- CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/find_package/PolicyPush.cmake b/Tests/RunCMake/find_package/PolicyPush.cmake
deleted file mode 100644
index 30c3ce2..0000000
--- a/Tests/RunCMake/find_package/PolicyPush.cmake
+++ /dev/null
@@ -1 +0,0 @@
-find_package(PolicyPush 1 CONFIG PATHS ${CMAKE_CURRENT_SOURCE_DIR}/PolicyPush NO_DEFAULT_PATH)
diff --git a/Tests/RunCMake/find_package/PolicyPush/PolicyPushConfig.cmake b/Tests/RunCMake/find_package/PolicyPush/PolicyPushConfig.cmake
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake b/Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake
deleted file mode 100644
index 45a8dbd..0000000
--- a/Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(PACKAGE_VERSION 1)
-set(PACKAGE_VERSION_COMPATIBLE 1)
-cmake_policy(PUSH)
diff --git a/Tests/RunCMake/find_package/RunCMakeTest.cmake b/Tests/RunCMake/find_package/RunCMakeTest.cmake
index 81b2906..42705b7 100644
--- a/Tests/RunCMake/find_package/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_package/RunCMakeTest.cmake
@@ -13,6 +13,4 @@ run_cmake(MissingConfigOneName)
run_cmake(MissingConfigRequired)
run_cmake(MissingConfigVersion)
run_cmake(MixedModeOptions)
-run_cmake(PolicyPush)
-run_cmake(PolicyPop)
run_cmake(SetFoundFALSE)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/find_package/PolicyPop-result.txt | 1 -
Tests/RunCMake/find_package/PolicyPop-stderr.txt | 5 -----
Tests/RunCMake/find_package/PolicyPop.cmake | 1 -
.../RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake | 3 ---
Tests/RunCMake/find_package/PolicyPush-result.txt | 1 -
Tests/RunCMake/find_package/PolicyPush-stderr.txt | 5 -----
Tests/RunCMake/find_package/PolicyPush.cmake | 1 -
.../find_package/PolicyPush/PolicyPushConfigVersion.cmake | 3 ---
Tests/RunCMake/find_package/RunCMakeTest.cmake | 2 --
9 files changed, 22 deletions(-)
delete mode 100644 Tests/RunCMake/find_package/PolicyPop-result.txt
delete mode 100644 Tests/RunCMake/find_package/PolicyPop-stderr.txt
delete mode 100644 Tests/RunCMake/find_package/PolicyPop.cmake
delete mode 100644 Tests/RunCMake/find_package/PolicyPop/PolicyPopConfig.cmake
delete mode 100644 Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake
delete mode 100644 Tests/RunCMake/find_package/PolicyPush-result.txt
delete mode 100644 Tests/RunCMake/find_package/PolicyPush-stderr.txt
delete mode 100644 Tests/RunCMake/find_package/PolicyPush.cmake
delete mode 100644 Tests/RunCMake/find_package/PolicyPush/PolicyPushConfig.cmake
delete mode 100644 Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list