[Cmake-commits] CMake branch, next, updated. v3.0.0-4429-gef8ae0c
Brad King
brad.king at kitware.com
Tue Jul 22 10:59:06 EDT 2014
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 ef8ae0c56fc87ddd1b2848f9c54f44f518aca6b9 (commit)
via fb95f820e06eb1933a7d3b71bc46eed4d5d25ee6 (commit)
from f51631ca91082d941764bca09cd6ffd3556738c1 (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=ef8ae0c56fc87ddd1b2848f9c54f44f518aca6b9
commit ef8ae0c56fc87ddd1b2848f9c54f44f518aca6b9
Merge: f51631c fb95f82
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 22 10:59:05 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 22 10:59:05 2014 -0400
Merge topic 'fix-complex-test-policies' into next
fb95f820 Tests: Set policies in 'complex' tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb95f820e06eb1933a7d3b71bc46eed4d5d25ee6
commit fb95f820e06eb1933a7d3b71bc46eed4d5d25ee6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 22 09:31:56 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 22 09:36:57 2014 -0400
Tests: Set policies in 'complex' tests
These tests cover the OLD behavior of some policies. Set them to
OLD to avoid warnings in the test output. Leave a comment that
explains why this is done here but not recommended in general.
diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 222250c..5e5eead 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -14,6 +14,21 @@ if(POLICY CMP0003)
endif()
endif()
+# It is not recommended to set a policy to OLD, but this test
+# covers the OLD behavior of some policies.
+foreach(p
+ CMP0029
+ CMP0032
+ CMP0033
+ CMP0034
+ CMP0043
+ CMP0050
+ )
+ if(POLICY ${p})
+ cmake_policy(SET ${p} OLD)
+ endif()
+endforeach()
+
# Test building without per-rule echo lines in Makefiles.
set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index 3f17dcc..3b73e70 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@@ -14,6 +14,21 @@ if(POLICY CMP0003)
endif()
endif()
+# It is not recommended to set a policy to OLD, but this test
+# covers the OLD behavior of some policies.
+foreach(p
+ CMP0029
+ CMP0032
+ CMP0033
+ CMP0034
+ CMP0043
+ CMP0050
+ )
+ if(POLICY ${p})
+ cmake_policy(SET ${p} OLD)
+ endif()
+endforeach()
+
# Test building without per-rule echo lines in Makefiles.
set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
-----------------------------------------------------------------------
Summary of changes:
Tests/Complex/CMakeLists.txt | 15 +++++++++++++++
Tests/ComplexOneConfig/CMakeLists.txt | 15 +++++++++++++++
2 files changed, 30 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list