kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2011-03-15 13:31:42 -04:00
parent d099546450
commit 6e8a67f99a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@ -47,12 +47,12 @@ void cmMakefileExecutableTargetGenerator::WriteRuleFiles()
// write rules used to help build object files // write rules used to help build object files
this->WriteCommonCodeRules(); this->WriteCommonCodeRules();
// write in rules for object files and custom commands
this->WriteTargetBuildRules();
// write the per-target per-language flags // write the per-target per-language flags
this->WriteTargetLanguageFlags(); this->WriteTargetLanguageFlags();
// write in rules for object files and custom commands
this->WriteTargetBuildRules();
// write the link rules // write the link rules
this->WriteExecutableRule(false); this->WriteExecutableRule(false);
if(this->Target->NeedRelinkBeforeInstall(this->ConfigName)) if(this->Target->NeedRelinkBeforeInstall(this->ConfigName))

6
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -52,12 +52,12 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
// write rules used to help build object files // write rules used to help build object files
this->WriteCommonCodeRules(); this->WriteCommonCodeRules();
// write in rules for object files and custom commands
this->WriteTargetBuildRules();
// write the per-target per-language flags // write the per-target per-language flags
this->WriteTargetLanguageFlags(); this->WriteTargetLanguageFlags();
// write in rules for object files and custom commands
this->WriteTargetBuildRules();
// write the link rules // write the link rules
// Write the rule for this target type. // Write the rule for this target type.
switch(this->Target->GetType()) switch(this->Target->GetType())