Merge topic 'fix-CMP0049-extra-error'

b2282631 cmTarget: Do not mistake a preceding error for a CMP0049 failure
This commit is contained in:
Brad King 2014-07-31 09:17:41 -04:00 committed by CMake Topic Stage
commit bd642272b9
5 changed files with 21 additions and 5 deletions

View File

@ -927,10 +927,13 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
if(!(src[0] == '$' && src[1] == '<'))
{
filename = this->ProcessSourceItemCMP0049(filename);
if (cmSystemTools::GetErrorOccuredFlag())
if(!filename.empty())
{
return;
filename = this->ProcessSourceItemCMP0049(filename);
if(filename.empty())
{
return;
}
}
this->Makefile->GetOrCreateSource(filename);
}
@ -998,8 +1001,7 @@ std::string cmTarget::ProcessSourceItemCMP0049(const std::string& s)
cmSourceFile* cmTarget::AddSourceCMP0049(const std::string& s)
{
std::string src = this->ProcessSourceItemCMP0049(s);
if (cmSystemTools::GetErrorOccuredFlag())
if(!s.empty() && src.empty())
{
return 0;
}

View File

@ -0,0 +1 @@
1

View File

@ -0,0 +1,9 @@
^CMake Error at CustomTargetAfterError.cmake:1 \(message\):
Error before add_custom_target
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
CMake Error at CustomTargetAfterError.cmake:3 \(message\):
Error after add_custom_target
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)$

View File

@ -0,0 +1,3 @@
message(SEND_ERROR "Error before add_custom_target")
add_custom_target(foo COMMAND echo)
message(SEND_ERROR "Error after add_custom_target")

View File

@ -1,5 +1,6 @@
include(RunCMake)
run_cmake(CustomTargetAfterError)
run_cmake(ErrorLogs)
run_cmake(FailCopyFileABI)