summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorTarget.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2012-09-20 21:22:24 (GMT)
committerStephen Kelly <steveire@gmail.com>2012-09-21 11:28:54 (GMT)
commit9a160871d0bc4233a71dfbf2ffcc888a940bb921 (patch)
tree53b0953d4bfdc30134a54b586cdcbf2fd6b95942 /Source/cmGeneratorTarget.cxx
parent4557c8db4813b4198fb7d64249e104bdcb828ae5 (diff)
downloadCMake-9a160871d0bc4233a71dfbf2ffcc888a940bb921.zip
CMake-9a160871d0bc4233a71dfbf2ffcc888a940bb921.tar.gz
CMake-9a160871d0bc4233a71dfbf2ffcc888a940bb921.tar.bz2
Convert paths in INCLUDE_DIRECTORIES property to Unix slashes.
Duplicate some of the logic from the include_directories command.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
-rw-r--r--Source/cmGeneratorTarget.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 91f16d1..ec83b7a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -299,9 +299,14 @@ std::vector<std::string> cmGeneratorTarget::GetIncludeDirectories()
for(std::vector<std::string>::const_iterator
li = includes.begin(); li != includes.end(); ++li)
{
- if(uniqueIncludes.insert(*li).second)
+ std::string inc = *li;
+ if (!cmSystemTools::IsOff(inc.c_str()))
{
- orderedAndUniqueIncludes.push_back(*li);
+ cmSystemTools::ConvertToUnixSlashes(inc);
+ }
+ if(uniqueIncludes.insert(inc).second)
+ {
+ orderedAndUniqueIncludes.push_back(inc);
}
}