mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 00:00:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-empty-target-property-queries' into release

Browse Source
This commit is contained in:
Brad King
2015-01-11 11:50:14 -05:00
parent ac16b88e50 c6d03a1072
commit ca5fe169aa
20 changed files with 170 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGetTargetPropertyCommand.cxx
+4 -1
View File
@@ -23,6 +23,7 @@ bool cmGetTargetPropertyCommand
std::string var = args[0];
const std::string& targetName = args[1];
std::string prop;
bool prop_exists = false;
if(args[2] == "ALIASED_TARGET")
{
@@ -32,6 +33,7 @@ bool cmGetTargetPropertyCommand
this->Makefile->FindTargetToUse(targetName))
{
prop = target->GetName();
prop_exists = true;
}
}
}
@@ -42,6 +44,7 @@ bool cmGetTargetPropertyCommand
if(prop_cstr)
{
prop = prop_cstr;
prop_exists = true;
}
}
else
@@ -74,7 +77,7 @@ bool cmGetTargetPropertyCommand
}
}
}
if (!prop.empty())
if (prop_exists)
{
this->Makefile->AddDefinition(var, prop.c_str());
return true;