summaryrefslogtreecommitdiffstats
path: root/Source/cmBuildCommand.cxx
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 /Source/cmBuildCommand.cxx
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 'Source/cmBuildCommand.cxx')
-rw-r--r--Source/cmBuildCommand.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx
index 27b959c..62fafa5 100644
--- a/Source/cmBuildCommand.cxx
+++ b/Source/cmBuildCommand.cxx
@@ -106,7 +106,8 @@ bool cmBuildCommand
}
std::string makecommand = this->Makefile->GetGlobalGenerator()
- ->GenerateCMakeBuildCommand(target, configuration, "", true);
+ ->GenerateCMakeBuildCommand(target, configuration, "",
+ this->Makefile->IgnoreErrorsCMP0061());
this->Makefile->AddDefinition(variable, makecommand.c_str());
@@ -135,7 +136,8 @@ bool cmBuildCommand
}
std::string makecommand = this->Makefile->GetGlobalGenerator()
- ->GenerateCMakeBuildCommand("", configType, "", true);
+ ->GenerateCMakeBuildCommand("", configType, "",
+ this->Makefile->IgnoreErrorsCMP0061());
if(cacheValue)
{