mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure generator expressions can be used with target_include_directories.

Browse Source 
Handle the case that a generator expression is used before treating
a non-target as an error.
This commit is contained in:
Stephen Kelly
2013-01-16 22:16:46 +01:00
parent c2ab74acb9
commit 24dcf0c007
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmTargetPropCommandBase.cxx
+12
View File
@@ -65,6 +65,14 @@ bool cmTargetPropCommandBase
return true;
}
//----------------------------------------------------------------------------
static bool isGeneratorExpression(const std::string &lib)
{
const std::string::size_type openpos = lib.find("$<");
return (openpos != std::string::npos)
&& (lib.find(">", openpos) != std::string::npos);
}
//----------------------------------------------------------------------------
bool cmTargetPropCommandBase
::ProcessContentArgs(std::vector<std::string> const& args,
@@ -105,6 +113,10 @@ bool cmTargetPropCommandBase
content += sep + "$<TARGET_PROPERTY:" + args[i]
+ ",INTERFACE_" + this->Property + ">";
}
else if(isGeneratorExpression(args[i]))
{
content += sep + args[i];
}
else if (!this->HandleNonTargetArg(content, sep, args[i], args[0]))
{
return false;