diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-15 17:31:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-03-17 19:21:59 (GMT) |
| commit | 6e8a67f99a34f2166ee838eb68968ae200830cac (patch) | |
| tree | e1a1262125ab8a6ffdca632d6176b4daad946a5d | |
| parent | d099546450a9c9ce12763cab1af182b2d98ebba6 (diff) | |
| download | CMake-6e8a67f99a34f2166ee838eb68968ae200830cac.zip CMake-6e8a67f99a34f2166ee838eb68968ae200830cac.tar.gz CMake-6e8a67f99a34f2166ee838eb68968ae200830cac.tar.bz2 | |
Generate target-wide flags before individual build rules
This switches the internal generation order but does not affect the
results. The new order ensures that any internal state changed by
generating target-wide flags is known when the individual rules that use
those flags are generated.
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 4426241..cd75d79 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -47,12 +47,12 @@ void cmMakefileExecutableTargetGenerator::WriteRuleFiles() // write rules used to help build object files this->WriteCommonCodeRules(); - // write in rules for object files and custom commands - this->WriteTargetBuildRules(); - // write the per-target per-language flags this->WriteTargetLanguageFlags(); + // write in rules for object files and custom commands + this->WriteTargetBuildRules(); + // write the link rules this->WriteExecutableRule(false); if(this->Target->NeedRelinkBeforeInstall(this->ConfigName)) diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 049a338..c5900f1 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -52,12 +52,12 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles() // write rules used to help build object files this->WriteCommonCodeRules(); - // write in rules for object files and custom commands - this->WriteTargetBuildRules(); - // write the per-target per-language flags this->WriteTargetLanguageFlags(); + // write in rules for object files and custom commands + this->WriteTargetBuildRules(); + // write the link rules // Write the rule for this target type. switch(this->Target->GetType()) |