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.

1 files changed, 7 insertions, 8 deletions

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 647697a..a669477 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/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);