Merge topic 'automoc-append-implicit-dirs'
753b905 Automoc: append implicit includes after user-specified dirs
This commit is contained in:
commit
3efede0ccc
@ -1407,8 +1407,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
|
||||
return;
|
||||
}
|
||||
|
||||
if (stripImplicitInclDirs)
|
||||
{
|
||||
std::vector<std::string> implicitDirs;
|
||||
// Load implicit include directories for this language.
|
||||
std::string impDirVar = "CMAKE_";
|
||||
impDirVar += lang;
|
||||
@ -1421,6 +1420,9 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
|
||||
i != impDirVec.end(); ++i)
|
||||
{
|
||||
emitted.insert(*i);
|
||||
if (!stripImplicitInclDirs)
|
||||
{
|
||||
implicitDirs.push_back(*i);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1463,6 +1465,15 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
|
||||
dirs.push_back(*i);
|
||||
}
|
||||
}
|
||||
|
||||
for(std::vector<std::string>::const_iterator i = implicitDirs.begin();
|
||||
i != implicitDirs.end(); ++i)
|
||||
{
|
||||
if(std::find(includes.begin(), includes.end(), *i) != includes.end())
|
||||
{
|
||||
dirs.push_back(*i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
|
||||
|
Loading…
x
Reference in New Issue
Block a user