From 2e9199b291879d9a47759faa178fb2f35b12bd64 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Mon, 30 Jul 2018 09:18:13 +0200 Subject: 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. --- Source/cmLocalGenerator.cxx | 15 +++++++-------- 1 file 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& 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); -- cgit v0.12