summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-07-23 13:44:29 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-07-23 13:44:29 (GMT)
commita263cab6c22ecfdd18ed592b9efb2d8a8c505852 (patch)
tree84fc783eae50359afcc58ba1c4232113a3285dbe
parent3e3ab2adb4a70352a41b469788a2885b20a86fef (diff)
parentfb95f820e06eb1933a7d3b71bc46eed4d5d25ee6 (diff)
downloadCMake-a263cab6c22ecfdd18ed592b9efb2d8a8c505852.zip
CMake-a263cab6c22ecfdd18ed592b9efb2d8a8c505852.tar.gz
CMake-a263cab6c22ecfdd18ed592b9efb2d8a8c505852.tar.bz2
Merge topic 'fix-complex-test-policies'
fb95f820 Tests: Set policies in 'complex' tests
-rw-r--r--Tests/Complex/CMakeLists.txt15
-rw-r--r--Tests/ComplexOneConfig/CMakeLists.txt15
2 files changed, 30 insertions, 0 deletions
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)