[Cmake-commits] CMake branch, next, updated. v3.4.0-1501-g257e743

Brad King brad.king at kitware.com
Tue Nov 24 13:41:08 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  257e7438abb7a536dd59c5e85a5ab5b7c74873a2 (commit)
       via  b0e539efd846e166441cf219029daae363ffacaa (commit)
      from  9b40c5d41d8ab3cea48dc0387d6f2b237628c985 (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=257e7438abb7a536dd59c5e85a5ab5b7c74873a2
commit 257e7438abb7a536dd59c5e85a5ab5b7c74873a2
Merge: 9b40c5d b0e539e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 24 13:41:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 24 13:41:07 2015 -0500

    Merge topic 'test-cmake_policy-unmatched' into next
    
    b0e539ef Tests: Add case for package version file unmatched policy scope


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0e539efd846e166441cf219029daae363ffacaa
commit b0e539efd846e166441cf219029daae363ffacaa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 24 13:36:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 24 13:40:49 2015 -0500

    Tests: Add case for package version file unmatched policy scope

diff --git a/Tests/RunCMake/find_package/PolicyPop-result.txt b/Tests/RunCMake/find_package/PolicyPop-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/find_package/PolicyPop-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/find_package/PolicyPop-stderr.txt b/Tests/RunCMake/find_package/PolicyPop-stderr.txt
new file mode 100644
index 0000000..745d39a
--- /dev/null
+++ b/Tests/RunCMake/find_package/PolicyPop-stderr.txt
@@ -0,0 +1,5 @@
+^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
new file mode 100644
index 0000000..4866f24
--- /dev/null
+++ b/Tests/RunCMake/find_package/PolicyPop.cmake
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake b/Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake
new file mode 100644
index 0000000..483fb10
--- /dev/null
+++ b/Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/find_package/PolicyPush-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/find_package/PolicyPush-stderr.txt b/Tests/RunCMake/find_package/PolicyPush-stderr.txt
new file mode 100644
index 0000000..1afcb16
--- /dev/null
+++ b/Tests/RunCMake/find_package/PolicyPush-stderr.txt
@@ -0,0 +1,5 @@
+^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
new file mode 100644
index 0000000..30c3ce2
--- /dev/null
+++ b/Tests/RunCMake/find_package/PolicyPush.cmake
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake b/Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake
new file mode 100644
index 0000000..45a8dbd
--- /dev/null
+++ b/Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake
@@ -0,0 +1,3 @@
+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 42705b7..81b2906 100644
--- a/Tests/RunCMake/find_package/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_package/RunCMakeTest.cmake
@@ -13,4 +13,6 @@ run_cmake(MissingConfigOneName)
 run_cmake(MissingConfigRequired)
 run_cmake(MissingConfigVersion)
 run_cmake(MixedModeOptions)
+run_cmake(PolicyPush)
+run_cmake(PolicyPop)
 run_cmake(SetFoundFALSE)

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

Summary of changes:
 .../CMP0004-NEW-result.txt => find_package/PolicyPop-result.txt}  |    0
 Tests/RunCMake/find_package/PolicyPop-stderr.txt                  |    5 +++++
 Tests/RunCMake/find_package/PolicyPop.cmake                       |    1 +
 .../RunCMake/find_package/PolicyPop/PolicyPopConfig.cmake         |    0
 .../RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake  |    3 +++
 .../CMP0004-NEW-result.txt => find_package/PolicyPush-result.txt} |    0
 Tests/RunCMake/find_package/PolicyPush-stderr.txt                 |    5 +++++
 Tests/RunCMake/find_package/PolicyPush.cmake                      |    1 +
 .../RunCMake/find_package/PolicyPush/PolicyPushConfig.cmake       |    0
 .../find_package/PolicyPush/PolicyPushConfigVersion.cmake         |    3 +++
 Tests/RunCMake/find_package/RunCMakeTest.cmake                    |    2 ++
 11 files changed, 20 insertions(+)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => find_package/PolicyPop-result.txt} (100%)
 create mode 100644 Tests/RunCMake/find_package/PolicyPop-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/PolicyPop.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_package/PolicyPop/PolicyPopConfig.cmake (100%)
 create mode 100644 Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => find_package/PolicyPush-result.txt} (100%)
 create mode 100644 Tests/RunCMake/find_package/PolicyPush-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/PolicyPush.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_package/PolicyPush/PolicyPushConfig.cmake (100%)
 create mode 100644 Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list