diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-14 19:06:54 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-14 19:06:54 (GMT) |
| commit | 4b0c9ee2be77324bd248fda245cb7e8ad6995b6c (patch) | |
| tree | 29a5c5ce102df6308ed87cfa9c6a3c5e216a445f /Source | |
| parent | 115ea25dabaa9d7a63aee3e3cc43549b6afb8c23 (diff) | |
| download | CMake-4b0c9ee2be77324bd248fda245cb7e8ad6995b6c.zip CMake-4b0c9ee2be77324bd248fda245cb7e8ad6995b6c.tar.gz CMake-4b0c9ee2be77324bd248fda245cb7e8ad6995b6c.tar.bz2 | |
Fix compile flags on c files in static liobraries on windows
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 7c72b08..49ce91d 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; } |