diff options
author | Brad King <brad.king@kitware.com> | 2009-10-08 15:56:07 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-10-08 15:56:07 (GMT) |
commit | 0653286dc670a77c39851ca8dbbceb85fe1db116 (patch) | |
tree | 2ea2e5b6fee80ec7e52082ada8706960a66b2462 /Source | |
parent | 2af045dfc584cdef64869829147e81b70afb8f09 (diff) | |
download | CMake-0653286dc670a77c39851ca8dbbceb85fe1db116.zip CMake-0653286dc670a77c39851ca8dbbceb85fe1db116.tar.gz CMake-0653286dc670a77c39851ca8dbbceb85fe1db116.tar.bz2 |
Split Borland compiler information files
This commit re-writes Borland compiler build rules. We split the rules
into modern <os>-<id>-<lang> information modules but share a common
macro between languages to avoid duplication.
We also address a bug in the previous rules that would build some target
types against the static Borland runtime and others against the shared
Borland runtime in one build tree. Now we always use the shared runtime
as is the default in the rules for MS tools.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 1d5aba4..c4ee5c7 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1951,15 +1951,6 @@ void cmLocalGenerator::AddSharedFlags(std::string& flags, flagsVar += "_FLAGS"; this->AppendFlags(flags, this->Makefile->GetDefinition(flagsVar.c_str())); } - - // Add flags specific to shared builds. - if(cmSystemTools::IsOn(this->Makefile->GetDefinition("BUILD_SHARED_LIBS"))) - { - flagsVar = "CMAKE_SHARED_BUILD_"; - flagsVar += lang; - flagsVar += "_FLAGS"; - this->AppendFlags(flags, this->Makefile->GetDefinition(flagsVar.c_str())); - } } //---------------------------------------------------------------------------- |