[Cmake-commits] [cmake-commits] king committed cmMakefileLibraryTargetGenerator.cxx 1.69 1.70
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Mar 16 16:55:55 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv9289/Source
Modified Files:
cmMakefileLibraryTargetGenerator.cxx
Log Message:
STYLE: Separate unrelated logic
This separates unrelated uses of a library-type switch into separate
switches. An upcoming commit will conditionally enter one of the
switches.
Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.69
retrieving revision 1.70
diff -C 2 -d -r1.69 -r1.70
*** cmMakefileLibraryTargetGenerator.cxx 10 Feb 2009 13:51:13 -0000 1.69
--- cmMakefileLibraryTargetGenerator.cxx 16 Mar 2009 20:55:53 -0000 1.70
***************
*** 452,456 ****
std::string buildEcho = "Linking ";
buildEcho += linkLanguage;
- const char* forbiddenFlagVar = 0;
switch(this->Target->GetType())
{
--- 452,455 ----
***************
*** 459,467 ****
break;
case cmTarget::SHARED_LIBRARY:
- forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
buildEcho += " shared library ";
break;
case cmTarget::MODULE_LIBRARY:
- forbiddenFlagVar = "_CREATE_SHARED_MODULE_FORBIDDEN_FLAGS";
buildEcho += " shared module ";
break;
--- 458,464 ----
***************
*** 474,477 ****
--- 471,486 ----
cmLocalUnixMakefileGenerator3::EchoLink);
+ const char* forbiddenFlagVar = 0;
+ switch(this->Target->GetType())
+ {
+ case cmTarget::SHARED_LIBRARY:
+ forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
+ break;
+ case cmTarget::MODULE_LIBRARY:
+ forbiddenFlagVar = "_CREATE_SHARED_MODULE_FORBIDDEN_FLAGS";
+ break;
+ default: break;
+ }
+
// Construct a list of files associated with this library that may
// need to be cleaned.
More information about the Cmake-commits
mailing list