Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit 19a8a3c4 authored by Stephen Kelly's avatar Stephen Kelly
Browse files

cmTarget: Don't finalize include directories in GetIncludeDirectories.

Rely on that having been done by the cmGlobalGenerator.
parent 3305364f
...@@ -1084,11 +1084,6 @@ void cmGlobalGenerator::Generate() ...@@ -1084,11 +1084,6 @@ void cmGlobalGenerator::Generate()
(*targets)[tit->first] = tit->second; (*targets)[tit->first] = tit->second;
(*targets)[tit->first].SetMakefile(mf); (*targets)[tit->first].SetMakefile(mf);
} }
for ( tit = targets->begin(); tit != targets->end(); ++ tit )
{
tit->second.AppendBuildInterfaceIncludes();
}
} }
// Add generator specific helper commands // Add generator specific helper commands
...@@ -1289,6 +1284,8 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo() ...@@ -1289,6 +1284,8 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
{ {
cmTarget* t = &ti->second; cmTarget* t = &ti->second;
t->AppendBuildInterfaceIncludes();
for (std::vector<cmValueWithOrigin>::const_iterator it for (std::vector<cmValueWithOrigin>::const_iterator it
= noconfig_compile_definitions.begin(); = noconfig_compile_definitions.begin();
it != noconfig_compile_definitions.end(); ++it) it != noconfig_compile_definitions.end(); ++it)
......
...@@ -1777,8 +1777,6 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config) ...@@ -1777,8 +1777,6 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
this->GetName(), this->GetName(),
"INCLUDE_DIRECTORIES", 0, 0); "INCLUDE_DIRECTORIES", 0, 0);
this->AppendBuildInterfaceIncludes();
std::vector<std::string> debugProperties; std::vector<std::string> debugProperties;
const char *debugProp = const char *debugProp =
this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment