ENH: Order compilation flags from most general to most specific: language, then target, then source.

1 files changed, 9 insertions, 6 deletions

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index ad9c72c..ffda9f2 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -321,8 +321,17 @@ cmMakefileTargetGenerator
     relativeObj = cmSystemTools::ConvertToOutputPath(relativeObj.c_str());
     }
   // Write the build rule.
+
   // Build the set of compiler flags.
   std::string flags;
+
+  // Add language-specific flags.
+  std::string langFlags = "$(";
+  langFlags += lang;
+  langFlags += "_FLAGS)";
+  this->LocalGenerator->AppendFlags(flags, langFlags.c_str());
+
+  // Add target-specific flags.
   if(this->Target->GetProperty("COMPILE_FLAGS"))
     {
     this->LocalGenerator->AppendFlags(flags, this->Target->GetProperty("COMPILE_FLAGS"));
@@ -339,12 +348,6 @@ cmMakefileTargetGenerator
                           << "\n";
     }
   
-  // Add language-specific flags.
-  std::string langFlags = "$(";
-  langFlags += lang;
-  langFlags += "_FLAGS)";
-  this->LocalGenerator->AppendFlags(flags, langFlags.c_str());
-  
   // Get the output paths for source and object files.
   std::string sourceFile = source.GetFullPath();
   if(this->LocalGenerator->m_UseRelativePaths)