Explorar el Código

STYLE: Convert unused target type cases to default

In switch statements that deal with only a few target types, use a
'default' case for the remaining target types instead of listing them
explicitly.  This will make it easier to add more types in the future.
Brad King hace 17 años
padre
commit
0bf093fd17
Se han modificado 2 ficheros con 5 adiciones y 25 borrados
  1. 2 10
      Source/cmLocalGenerator.cxx
  2. 3 15
      Source/cmTarget.cxx

+ 2 - 10
Source/cmLocalGenerator.cxx

@@ -723,11 +723,7 @@ void cmLocalGenerator
           }
         }
         break; 
-      case cmTarget::UTILITY:
-      case cmTarget::GLOBAL_TARGET:
-      case cmTarget::INSTALL_FILES:
-      case cmTarget::INSTALL_PROGRAMS:
-      case cmTarget::INSTALL_DIRECTORY:
+      default:
         break;
       }
     }
@@ -1441,11 +1437,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
         }
       }
       break; 
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::INSTALL_FILES:
-    case cmTarget::INSTALL_PROGRAMS:
-    case cmTarget::INSTALL_DIRECTORY:
+    default:
       break;
     }
 }

+ 3 - 15
Source/cmTarget.cxx

@@ -2043,11 +2043,7 @@ const char* cmTarget::GetCreateRuleVariable()
       return "_CREATE_SHARED_MODULE";
     case cmTarget::EXECUTABLE:
       return "_LINK_EXECUTABLE";
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::INSTALL_FILES:
-    case cmTarget::INSTALL_PROGRAMS:
-    case cmTarget::INSTALL_DIRECTORY:
+    default:
       break;
     }
   return "";
@@ -2073,11 +2069,7 @@ const char* cmTarget::GetSuffixVariableInternal(TargetType type,
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_SUFFIX"
               : "CMAKE_EXECUTABLE_SUFFIX");
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::INSTALL_FILES:
-    case cmTarget::INSTALL_PROGRAMS:
-    case cmTarget::INSTALL_DIRECTORY:
+    default:
       break;
     }
   return "";
@@ -2102,11 +2094,7 @@ const char* cmTarget::GetPrefixVariableInternal(TargetType type,
               : "CMAKE_SHARED_MODULE_PREFIX");
     case cmTarget::EXECUTABLE:
       return (implib? "CMAKE_IMPORT_LIBRARY_PREFIX" : "");
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::INSTALL_FILES:
-    case cmTarget::INSTALL_PROGRAMS:
-    case cmTarget::INSTALL_DIRECTORY:
+    default:
       break;
     }
   return "";