summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-05 19:46:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-02-05 19:46:23 (GMT)
commitd1660f089585ef2e28d918f87d1e6065a444bb2c (patch)
tree5967e3d80c10bed37c936f9e07eadbc49a1cd115
parent08f69324bb440ea873d78e271a3f360b9c558af7 (diff)
parentb6f66542674cac75821dfb10677bf52318afcda5 (diff)
downloadCMake-d1660f089585ef2e28d918f87d1e6065a444bb2c.zip
CMake-d1660f089585ef2e28d918f87d1e6065a444bb2c.tar.gz
CMake-d1660f089585ef2e28d918f87d1e6065a444bb2c.tar.bz2
Merge topic 'fix-include-directories-unix-path'
b6f6654 Use the result of converting to a unix path.
-rw-r--r--Source/cmTarget.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 5669872..132154c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2797,10 +2797,10 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
if(uniqueIncludes.insert(inc).second)
{
- includes.push_back(*li);
+ includes.push_back(inc);
if (debugIncludes)
{
- usedIncludes += " * " + *li + "\n";
+ usedIncludes += " * " + inc + "\n";
}
}
}