From 1092d41f692f8889f2ee9f2e79d5934e37d1242f Mon Sep 17 00:00:00 2001
From: Zaheer Chothia <zaheer.chothia@gmail.com>
Date: Thu, 26 Apr 2012 13:09:10 +0100
Subject: [PATCH] Ninja: Fix #13069 - CMAKE_<LANG>_FLAGS_<TYPE> flags not
 applied to executable commands

---
 Source/cmLocalGenerator.cxx |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 13ede5d..da2d7f7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1550,15 +1550,8 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
            target.GetName());
         return;
         }
-      std::string langVar = "CMAKE_";
-      langVar += linkLanguage;
-      std::string flagsVar = langVar + "_FLAGS";
-      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());
+      this->AddLanguageFlags(flags, linkLanguage, buildType.c_str());
+      this->AddSharedFlags(flags, linkLanguage, true);
       flags += " ";
       cmOStringStream linklibs;
       this->OutputLinkLibraries(linklibs, target, false);
-- 
1.7.10