diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-22 18:45:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-03-22 18:45:44 (GMT) |
| commit | 1c3233a850843bf8cf4863f1f0df9378708edffc (patch) | |
| tree | e598918be33a3b76ce1ccf5caf9508712c376cad /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 685d8935006ef8ea29f5ae6636dbb29b216fa9ef (diff) | |
| parent | 86cb17b18de78e178b76e9be471789084994a162 (diff) | |
| download | CMake-1c3233a850843bf8cf4863f1f0df9378708edffc.zip CMake-1c3233a850843bf8cf4863f1f0df9378708edffc.tar.gz CMake-1c3233a850843bf8cf4863f1f0df9378708edffc.tar.bz2 | |
Merge topic 'include-flags-response-file'
86cb17b Pass include directories with response files to GNU on Windows
9a0b9bc Optionally pass include directories with response files
6e8a67f Generate target-wide flags before individual build rules
d099546 Factor old-style -D flags out from -I flag generation
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 1e9a670..31f7be5 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -72,12 +72,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()) |