[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.319 1.320

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv18882/Source

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
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.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.319
retrieving revision 1.320
diff -C 2 -d -r1.319 -r1.320
*** cmLocalGenerator.cxx	2 Oct 2009 17:52:00 -0000	1.319
--- cmLocalGenerator.cxx	8 Oct 2009 15:55:58 -0000	1.320
***************
*** 1952,1964 ****
      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()));
-     }
  }
  
--- 1952,1955 ----