Просмотр исходного кода

cmLocalGenerator: Respect user requested implicit include directories order

In ``cmLocalGenerator::GetIncludeDirectories`` append the user requested
implicit include directories first, then append the remaining implicit
include directories.  By By doing so we keep the user requested order of
implicit include directories.
Sebastian Holtermann 7 лет назад
Родитель
Сommit
2e9199b291
1 измененных файлов с 7 добавлено и 8 удалено
  1. 7 8
      Source/cmLocalGenerator.cxx

+ 7 - 8
Source/cmLocalGenerator.cxx

@@ -960,15 +960,14 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
   }
 
   if (!stripImplicitDirs) {
-    if (!appendAllImplicitDirs) {
-      // Append only those implicit directories that were requested by the user
-      for (std::string const& i : implicitDirs) {
-        if (std::find(userDirs.begin(), userDirs.end(), i) != userDirs.end()) {
-          dirs.push_back(i);
-        }
+    // Append only implicit directories that were requested by the user
+    for (std::string const& i : implicitDirs) {
+      if (std::find(userDirs.begin(), userDirs.end(), i) != userDirs.end()) {
+        dirs.push_back(i);
       }
-    } else {
-      // Append all implicit directories
+    }
+    // Append remaining implicit directories on demand
+    if (appendAllImplicitDirs) {
       for (std::string const& i : implicitDirs) {
         if (std::find(dirs.begin(), dirs.end(), i) == dirs.end()) {
           dirs.push_back(i);