diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-11-07 13:10:11 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-11-07 13:11:31 (GMT) |
| commit | 19a8a3c4c8105c85527da8651729f6300c054d74 (patch) | |
| tree | 579ee05330a4ff94ff2b88df09102442d73a1dd0 | |
| parent | 3305364f831023dcc6ab670c087f36d0688b99d1 (diff) | |
| download | CMake-19a8a3c4c8105c85527da8651729f6300c054d74.zip CMake-19a8a3c4c8105c85527da8651729f6300c054d74.tar.gz CMake-19a8a3c4c8105c85527da8651729f6300c054d74.tar.bz2 | |
cmTarget: Don't finalize include directories in GetIncludeDirectories.
Rely on that having been done by the cmGlobalGenerator.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 1cd158c..9c9df99 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1084,11 +1084,6 @@ void cmGlobalGenerator::Generate() (*targets)[tit->first] = tit->second; (*targets)[tit->first].SetMakefile(mf); } - - for ( tit = targets->begin(); tit != targets->end(); ++ tit ) - { - tit->second.AppendBuildInterfaceIncludes(); - } } // Add generator specific helper commands @@ -1289,6 +1284,8 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo() { cmTarget* t = &ti->second; + t->AppendBuildInterfaceIncludes(); + for (std::vector<cmValueWithOrigin>::const_iterator it = noconfig_compile_definitions.begin(); it != noconfig_compile_definitions.end(); ++it) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index d0390f7..9162d17 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1777,8 +1777,6 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config) this->GetName(), "INCLUDE_DIRECTORIES", 0, 0); - this->AppendBuildInterfaceIncludes(); - std::vector<std::string> debugProperties; const char *debugProp = this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); |