|
|
@@ -40,14 +40,6 @@ void cmTargetIncludeDirectoriesCommand
|
|
|
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
|
|
|
}
|
|
|
|
|
|
-//----------------------------------------------------------------------------
|
|
|
-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);
|
|
|
-}
|
|
|
-
|
|
|
//----------------------------------------------------------------------------
|
|
|
std::string cmTargetIncludeDirectoriesCommand
|
|
|
::Join(const std::vector<std::string> &content)
|
|
|
@@ -59,7 +51,7 @@ std::string cmTargetIncludeDirectoriesCommand
|
|
|
it != content.end(); ++it)
|
|
|
{
|
|
|
if (cmSystemTools::FileIsFullPath(it->c_str())
|
|
|
- || isGeneratorExpression(*it))
|
|
|
+ || cmGeneratorExpression::Find(*it) != std::string::npos)
|
|
|
{
|
|
|
dirs += sep + *it;
|
|
|
}
|