diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-11-15 22:45:03 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-11-15 22:45:03 (GMT) |
| commit | dad83f4d3c0741e6ea9b2deafe839c4dfefdaff3 (patch) | |
| tree | 46e21c96fc22efcd67ea550ea5e245ef832f8858 /Source/cmLocalUnixMakefileGenerator.cxx | |
| parent | c164ba1ba157f82a05f18a5c03df653840be590e (diff) | |
| download | CMake-dad83f4d3c0741e6ea9b2deafe839c4dfefdaff3.zip CMake-dad83f4d3c0741e6ea9b2deafe839c4dfefdaff3.tar.gz CMake-dad83f4d3c0741e6ea9b2deafe839c4dfefdaff3.tar.bz2 | |
BUG: fix for borland run time dll
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 49ce91d..f9a93e9 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -2194,7 +2194,6 @@ OutputBuildObjectFromSource(std::ostream& fout, { flags += extraCompileFlags; } - flags += "$(INCLUDE_FLAGS) "; std::string sourceFile = cmSystemTools::ConvertToOutputPath(source.GetFullPath().c_str()); std::string buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE"); @@ -2217,6 +2216,11 @@ OutputBuildObjectFromSource(std::ostream& fout, { flags += this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_C_FLAGS"); flags += " "; + } + if(cmSystemTools::IsOn(m_Makefile->GetDefinition("BUILD_SHARED_LIBS"))) + { + flags += this->GetSafeDefinition("CMAKE_SHARED_BUILD_C_FLAGS"); + flags += " "; } break; } @@ -2272,6 +2276,7 @@ OutputBuildObjectFromSource(std::ostream& fout, sourceFile.c_str()); break; } + flags += "$(INCLUDE_FLAGS) "; // expand multi-command semi-colon separated lists // of commands into separate commands std::vector<std::string> commands; |