From 4b0c9ee2be77324bd248fda245cb7e8ad6995b6c Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Thu, 14 Nov 2002 14:06:54 -0500 Subject: [PATCH] Fix compile flags on c files in static liobraries on windows --- Source/cmLocalUnixMakefileGenerator.cxx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 7c72b08d3..49ce91d78 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -2206,19 +2206,17 @@ OutputBuildObjectFromSource(std::ostream& fout, rules.push_back(m_Makefile->GetDefinition("CMAKE_C_COMPILE_OBJECT")); flags += this->GetSafeDefinition("CMAKE_C_FLAGS"); flags += " "; + if(buildType.size()) + { + std::string build = "CMAKE_C_FLAGS_"; + build += buildType; + flags += this->GetSafeDefinition(build.c_str()); + flags += " "; + } if(shared) { flags += this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_C_FLAGS"); flags += " "; - flags += this->GetSafeDefinition("CMAKE_C_FLAGS"); - flags += " "; - if(buildType.size()) - { - std::string build = "CMAKE_C_FLAGS_"; - build += buildType; - flags += this->GetSafeDefinition(build.c_str()); - flags += " "; - } } break; }