Commit 6f98f4ac authored by Stephen Kelly's avatar Stephen Kelly Committed by Brad King
Browse files

Genex: Fix processing multiple include directories for relative paths

Re-insert the semicolon which was removed during splitting.

Commit d777b8e7 (Genex: Allow relative paths in INSTALL_INTERFACE.,
2013-07-25) introduced the prefixItems method to allow relative paths
in the argument of the INSTALL_INTERFACE expression. That method was
buggy in that it did not re-introduce the semicolon separator in
the result.

This bug also affects paths which are already absolute in user code.
parent 5b98d09e
......@@ -238,9 +238,12 @@ static void prefixItems(const std::string &content, std::string &result,
std::vector<std::string> entries;
cmGeneratorExpression::Split(content, entries);
const char *sep = "";
for(std::vector<std::string>::const_iterator ei = entries.begin();
ei != entries.end(); ++ei)
result += sep;
sep = ";";
if (!cmSystemTools::FileIsFullPath(ei->c_str())
&& cmGeneratorExpression::Find(*ei) == std::string::npos)
......@@ -159,7 +159,7 @@ set_property(TARGET testLibRequired APPEND PROPERTY
# Test that the below is non-fatal
set_property(TARGET testLibRequired APPEND PROPERTY
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment