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 f368abbf74ff9b59b40e142a9c54ccf88c7c49ea (commit)
via 62126b67e0048800a833d3c4ea86d2307f1a4a06 (commit)
via 2e28c619f8997a2b86c72b53659be371ff10a790 (commit)
via b219ff94acf0b6c934c35e2ce42dfbf99580f1e8 (commit)
from a2358610481fa1206418d43bbc95aaeda3f54816 (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=f368abbf74ff9b59b40e142a9c54ccf88c7c49ea
commit f368abbf74ff9b59b40e142a9c54ccf88c7c49ea
Merge: a235861 62126b6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 24 14:12:18 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 24 14:12:18 2015 -0500
Merge topic 'fix-find_package-version-file-error-stack' into next
62126b67 Merge branch 'test-cmake_policy-unmatched' into
fix-find_package-version-file-error-stack
2e28c619 cmState: Skip variable scope snapshots to avoid call stack
duplicates
b219ff94 Tests: Add case for package version file unmatched policy scope
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62126b67e0048800a833d3c4ea86d2307f1a4a06
commit 62126b67e0048800a833d3c4ea86d2307f1a4a06
Merge: 2e28c61 b219ff9
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 24 14:09:54 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 24 14:09:54 2015 -0500
Merge branch 'test-cmake_policy-unmatched' into
fix-find_package-version-file-error-stack
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e28c619f8997a2b86c72b53659be371ff10a790
commit 2e28c619f8997a2b86c72b53659be371ff10a790
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 24 14:05:43 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 24 14:09:27 2015 -0500
cmState: Skip variable scope snapshots to avoid call stack duplicates
Since commit v3.4.0-rc1~179^2~1 (cmState: Add a VariableScope snapshot
type, 2015-08-23) the snapshot stack may have a VariableScopeType entry.
Skip over these when constructing the call stack, just as we do for
policy scopes. Otherwise we report the command causing the variable
scope to be entered twice (e.g. find_package while loading a package
version file).
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index ce9ff32..363d2bf 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1081,7 +1081,8 @@ cmState::Snapshot cmState::Snapshot::GetCallStackParent()
const
Snapshot snapshot;
PositionType parentPos = this->Position;
- while(parentPos->SnapshotType == cmState::PolicyScopeType)
+ while (parentPos->SnapshotType == cmState::PolicyScopeType ||
+ parentPos->SnapshotType == cmState::VariableScopeType)
{
++parentPos;
}
@@ -1092,7 +1093,8 @@ cmState::Snapshot cmState::Snapshot::GetCallStackParent()
const
}
++parentPos;
- while(parentPos->SnapshotType == cmState::PolicyScopeType)
+ while (parentPos->SnapshotType == cmState::PolicyScopeType ||
+ parentPos->SnapshotType == cmState::VariableScopeType)
{
++parentPos;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b219ff94acf0b6c934c35e2ce42dfbf99580f1e8
commit b219ff94acf0b6c934c35e2ce42dfbf99580f1e8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 24 13:36:18 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 24 14:01:21 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:
Source/cmState.cxx | 6 ++++--
.../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 +++
.../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 ++
12 files changed, 24 insertions(+), 2 deletions(-)
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
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
