From d807aab28fd86586e8ecb5e4f4d35b43bc68d5f8 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Mon, 30 Apr 2012 04:25:37 +0100
Subject: [PATCH] Ninja: apply CMAKE_<LANG>_FLAGS_<TYPE> to executable targets
 (#13069)

Based on a patch by Zaheer Chothia!
---
 Source/cmLocalGenerator.cxx             |  5 +----
 Source/cmNinjaNormalTargetGenerator.cxx | 11 ++++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6362d8025..8265d72b4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1548,13 +1548,10 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
            target.GetName());
         return;
         }
-      std::string langVar = "CMAKE_";
-      langVar += linkLanguage;
-      std::string flagsVar = langVar + "_FLAGS";
+      this->AddLanguageFlags(flags, linkLanguage, buildType.c_str());
       std::string sharedFlagsVar = "CMAKE_SHARED_LIBRARY_";
       sharedFlagsVar += linkLanguage;
       sharedFlagsVar += "_FLAGS";
-      flags += this->Makefile->GetSafeDefinition(flagsVar.c_str());
       flags += " ";
       flags += this->Makefile->GetSafeDefinition(sharedFlagsVar.c_str());
       flags += " ";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 63ba58df5..8b86a98d2 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -193,12 +193,13 @@ cmNinjaNormalTargetGenerator
     vars.LinkFlags = "$LINK_FLAGS";
 
     std::string langFlags;
-    this->GetLocalGenerator()->AddLanguageFlags(langFlags,
-                                                this->TargetLinkLanguage,
-                                                this->GetConfigName());
-    if (targetType != cmTarget::EXECUTABLE)
+    if (targetType != cmTarget::EXECUTABLE) {
+      this->GetLocalGenerator()->AddLanguageFlags(langFlags,
+                                                  this->TargetLinkLanguage,
+                                                  this->GetConfigName());
       langFlags += " $ARCH_FLAGS";
-    vars.LanguageCompileFlags = langFlags.c_str();
+      vars.LanguageCompileFlags = langFlags.c_str();
+    }
 
     // Rule for linking library.
     std::vector<std::string> linkCmds = this->ComputeLinkCmd();