Explorar o código

Convert paths in INCLUDE_DIRECTORIES property to Unix slashes.

Duplicate some of the logic from the include_directories command.
Stephen Kelly %!s(int64=13) %!d(string=hai) anos
pai
achega
9a160871d0
Modificáronse 1 ficheiros con 7 adicións e 2 borrados
  1. 7 2
      Source/cmGeneratorTarget.cxx

+ 7 - 2
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);
       }
     }