diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-12 13:32:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-12 13:32:08 (GMT) |
| commit | a4b9adec893b7cbce41fbffe65564f80b05e5746 (patch) | |
| tree | 29f75b9f3d04f50db3bb2ca9588e91803b7c3c0e /Source/cmGlobalGenerator.cxx | |
| parent | a1e22f691792d0c3bcc895ae30f676c6e90167fa (diff) | |
| parent | dcac9be6aa33601db1b32f4efd9f724a97f8844b (diff) | |
| download | CMake-a4b9adec893b7cbce41fbffe65564f80b05e5746.zip CMake-a4b9adec893b7cbce41fbffe65564f80b05e5746.tar.gz CMake-a4b9adec893b7cbce41fbffe65564f80b05e5746.tar.bz2 | |
Merge topic 'constify'
dcac9be Make accessors for compile-related information const.
19a8a3c cmTarget: Don't finalize include directories in GetIncludeDirectories.
3305364 cmGlobalGenerator: Rename the FinalizeCompileDefinitions method.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index eb1e37e..4ea5895 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1059,7 +1059,7 @@ void cmGlobalGenerator::Generate() return; } - this->FinalizeTargetCompileDefinitions(); + this->FinalizeTargetCompileInfo(); #ifdef CMAKE_BUILD_WITH_CMAKE // Iterate through all targets and set up automoc for those which have @@ -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 @@ -1270,7 +1265,7 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens) } //---------------------------------------------------------------------------- -void cmGlobalGenerator::FinalizeTargetCompileDefinitions() +void cmGlobalGenerator::FinalizeTargetCompileInfo() { // Construct per-target generator information. for(unsigned int i=0; i < this->LocalGenerators.size(); ++i) @@ -1289,6 +1284,8 @@ void cmGlobalGenerator::FinalizeTargetCompileDefinitions() { cmTarget* t = &ti->second; + t->AppendBuildInterfaceIncludes(); + for (std::vector<cmValueWithOrigin>::const_iterator it = noconfig_compile_definitions.begin(); it != noconfig_compile_definitions.end(); ++it) |