summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/build_command/RunCMakeTest.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-08 19:41:08 (GMT)
committerBrad King <brad.king@kitware.com>2015-05-12 13:06:49 (GMT)
commit226df303f955a8756cda7544f58242b52ea7ec2e (patch)
treef4ad45a19cb1b2387b93f76355f06d19c8b9dbfd /Tests/RunCMake/build_command/RunCMakeTest.cmake
parent28e7a135e001afb36a7cff8e896ebac75390dde0 (diff)
downloadCMake-226df303f955a8756cda7544f58242b52ea7ec2e.zip
CMake-226df303f955a8756cda7544f58242b52ea7ec2e.tar.gz
CMake-226df303f955a8756cda7544f58242b52ea7ec2e.tar.bz2
CTest: Stop telling 'make' to ignore errors with -i
Add policy CMP0061 to maintain compatibility for existing projects.
Diffstat (limited to 'Tests/RunCMake/build_command/RunCMakeTest.cmake')
-rw-r--r--Tests/RunCMake/build_command/RunCMakeTest.cmake8
1 files changed, 8 insertions, 0 deletions
diff --git a/Tests/RunCMake/build_command/RunCMakeTest.cmake b/Tests/RunCMake/build_command/RunCMakeTest.cmake
index eaa1d77..c3bef4c 100644
--- a/Tests/RunCMake/build_command/RunCMakeTest.cmake
+++ b/Tests/RunCMake/build_command/RunCMakeTest.cmake
@@ -1,4 +1,5 @@
include(RunCMake)
+unset(ENV{CMAKE_CONFIG_TYPE})
run_cmake(ErrorsOFF)
run_cmake(ErrorsON)
@@ -6,3 +7,10 @@ run_cmake(ErrorsON)
set(RunCMake_TEST_OPTIONS -DNoProject=1)
run_cmake(BeforeProject)
unset(RunCMake_TEST_OPTIONS)
+
+run_cmake(CMP0061-NEW)
+if(RunCMake_GENERATOR MATCHES "Make")
+ run_cmake(CMP0061-OLD-make)
+else()
+ run_cmake(CMP0061-OLD-other)
+endif()