Make sure generator expressions can be used with target_include_directories.

Handle the case that a generator expression is used before treating
a non-target as an error.

1 files changed, 12 insertions, 0 deletions

diff --git a/Source/cmTargetPropCommandBase.cxx b/Source/cmTargetPropCommandBase.cxx
index 69aaf17772..7f15dcb64b 100644
--- a/Source/cmTargetPropCommandBase.cxx
+++ b/Source/cmTargetPropCommandBase.cxx
@@ -66,6 +66,14 @@ bool cmTargetPropCommandBase
 }
 
 //----------------------------------------------------------------------------
+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,
                      unsigned int &argIndex, bool prepend)
@@ -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;