Browse Source

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.
Brad King 17 years ago
parent
commit
49dec94f54
1 changed files with 12 additions and 3 deletions
  1. 12 3
      Source/cmMakefileLibraryTargetGenerator.cxx

+ 12 - 3
Source/cmMakefileLibraryTargetGenerator.cxx

@@ -451,18 +451,15 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   // Add the link message.
   std::string buildEcho = "Linking ";
   buildEcho += linkLanguage;
-  const char* forbiddenFlagVar = 0;
   switch(this->Target->GetType())
     {
     case cmTarget::STATIC_LIBRARY:
       buildEcho += " static library "; 
       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;
     default:
@@ -473,6 +470,18 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
                                    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.
   std::vector<std::string> libCleanFiles;