kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-TARGET_PROPERTY-extraction'

Browse Source 
5daaa5c Fix TARGET_PROPERTY target extractions.
This commit is contained in:
Brad King 2013-01-29 14:52:34 -05:00 committed by CMake Topic Stage
commit 2eb7cee117
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmExportFileGenerator.cxx
View File

@ -367,7 +367,6 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
std::string::size_type lastPos = pos; std::string::size_type lastPos = pos;
cmMakefile *mf = target->GetMakefile(); cmMakefile *mf = target->GetMakefile();
std::string errorString;
while((pos = input.find("$<TARGET_PROPERTY:", lastPos)) != input.npos) while((pos = input.find("$<TARGET_PROPERTY:", lastPos)) != input.npos)
{ {
@ -388,21 +387,14 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
std::string targetName = input.substr(nameStartPos, std::string targetName = input.substr(nameStartPos,
commaPos - nameStartPos); commaPos - nameStartPos);
if (!this->AddTargetNamespace(targetName, target, missingTargets)) if (this->AddTargetNamespace(targetName, target, missingTargets))
{ {
errorString = "$<TARGET_PROPERTY:" + targetName + ",prop> requires "
"its first parameter to be a reachable target.";
break;
}
input.replace(nameStartPos, commaPos - nameStartPos, targetName); input.replace(nameStartPos, commaPos - nameStartPos, targetName);
}
lastPos = pos + targetName.size(); lastPos = pos + targetName.size();
} }
if (!errorString.empty())
{
mf->IssueMessage(cmake::FATAL_ERROR, errorString);
return;
}
std::string errorString;
pos = 0; pos = 0;
lastPos = pos; lastPos = pos;
while((pos = input.find("$<TARGET_NAME:", lastPos)) != input.npos) while((pos = input.find("$<TARGET_NAME:", lastPos)) != input.npos)

2
Tests/ExportImport/Export/CMakeLists.txt
View File

@ -164,6 +164,8 @@ set_property(TARGET testLibRequired APPEND PROPERTY
$<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired4,INTERFACE_INCLUDE_DIRECTORIES>> $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired4,INTERFACE_INCLUDE_DIRECTORIES>>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired5,INTERFACE_INCLUDE_DIRECTORIES>> $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired5,INTERFACE_INCLUDE_DIRECTORIES>>
$<INSTALL_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired6,INTERFACE_INCLUDE_DIRECTORIES>> $<INSTALL_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired6,INTERFACE_INCLUDE_DIRECTORIES>>
# Test that the below is non-fatal
$<$<TARGET_DEFINED:not_a_target>:$<TARGET_PROPERTY:not_a_target,INTERFACE_INCLUDE_DIRECTORIES>>
) )
set_property(TARGET testLibRequired APPEND PROPERTY set_property(TARGET testLibRequired APPEND PROPERTY