瀏覽代碼

cmGeneratorTarget: Remove default config from Get* methods

Ensure all call sites pass an explicit configuration.
Brad King 5 年之前
父節點
當前提交
3fa3b7a402

+ 3 - 1
Source/cmExportBuildAndroidMKGenerator.cxx

@@ -47,7 +47,9 @@ void cmExportBuildAndroidMKGenerator::GenerateImportTargetCode(
   os << "LOCAL_MODULE := ";
   os << "LOCAL_MODULE := ";
   os << targetName << "\n";
   os << targetName << "\n";
   os << "LOCAL_SRC_FILES := ";
   os << "LOCAL_SRC_FILES := ";
-  std::string path = cmSystemTools::ConvertToOutputPath(target->GetFullPath());
+  std::string const noConfig; // FIXME: What config to use here?
+  std::string path =
+    cmSystemTools::ConvertToOutputPath(target->GetFullPath(noConfig));
   os << path << "\n";
   os << path << "\n";
 }
 }
 
 

+ 2 - 1
Source/cmGeneratorTarget.cxx

@@ -1097,7 +1097,8 @@ const std::string& cmGeneratorTarget::GetLocationForBuild() const
   }
   }
 
 
   // Now handle the deprecated build-time configuration location.
   // Now handle the deprecated build-time configuration location.
-  location = this->GetDirectory();
+  std::string const noConfig;
+  location = this->GetDirectory(noConfig);
   const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
   const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
   if (cfgid && strcmp(cfgid, ".") != 0) {
   if (cfgid && strcmp(cfgid, ".") != 0) {
     location += "/";
     location += "/";

+ 8 - 9
Source/cmGeneratorTarget.h

@@ -245,7 +245,7 @@ public:
   /** Get the full path to the target according to the settings in its
   /** Get the full path to the target according to the settings in its
       makefile and the configuration type.  */
       makefile and the configuration type.  */
   std::string GetFullPath(
   std::string GetFullPath(
-    const std::string& config = "",
+    const std::string& config,
     cmStateEnums::ArtifactType artifact = cmStateEnums::RuntimeBinaryArtifact,
     cmStateEnums::ArtifactType artifact = cmStateEnums::RuntimeBinaryArtifact,
     bool realname = false) const;
     bool realname = false) const;
   std::string NormalGetFullPath(const std::string& config,
   std::string NormalGetFullPath(const std::string& config,
@@ -283,7 +283,7 @@ public:
 
 
   /** Get the full name of the target according to the settings in its
   /** Get the full name of the target according to the settings in its
       makefile.  */
       makefile.  */
-  std::string GetFullName(const std::string& config = "",
+  std::string GetFullName(const std::string& config,
                           cmStateEnums::ArtifactType artifact =
                           cmStateEnums::ArtifactType artifact =
                             cmStateEnums::RuntimeBinaryArtifact) const;
                             cmStateEnums::RuntimeBinaryArtifact) const;
 
 
@@ -326,8 +326,7 @@ public:
   std::string GetSOName(const std::string& config) const;
   std::string GetSOName(const std::string& config) const;
 
 
   void GetFullNameComponents(std::string& prefix, std::string& base,
   void GetFullNameComponents(std::string& prefix, std::string& base,
-                             std::string& suffix,
-                             const std::string& config = "",
+                             std::string& suffix, const std::string& config,
                              cmStateEnums::ArtifactType artifact =
                              cmStateEnums::ArtifactType artifact =
                                cmStateEnums::RuntimeBinaryArtifact) const;
                                cmStateEnums::RuntimeBinaryArtifact) const;
 
 
@@ -540,7 +539,7 @@ public:
       configuration name is given then the generator will add its
       configuration name is given then the generator will add its
       subdirectory for that configuration.  Otherwise just the canonical
       subdirectory for that configuration.  Otherwise just the canonical
       output directory is given.  */
       output directory is given.  */
-  std::string GetDirectory(const std::string& config = "",
+  std::string GetDirectory(const std::string& config,
                            cmStateEnums::ArtifactType artifact =
                            cmStateEnums::ArtifactType artifact =
                              cmStateEnums::RuntimeBinaryArtifact) const;
                              cmStateEnums::RuntimeBinaryArtifact) const;
 
 
@@ -548,7 +547,7 @@ public:
       If the configuration name is given then the generator will add its
       If the configuration name is given then the generator will add its
       subdirectory for that configuration.  Otherwise just the canonical
       subdirectory for that configuration.  Otherwise just the canonical
       compiler pdb output directory is given.  */
       compiler pdb output directory is given.  */
-  std::string GetCompilePDBDirectory(const std::string& config = "") const;
+  std::string GetCompilePDBDirectory(const std::string& config) const;
 
 
   /** Get sources that must be built before the given source.  */
   /** Get sources that must be built before the given source.  */
   std::vector<cmSourceFile*> const* GetSourceDepends(
   std::vector<cmSourceFile*> const* GetSourceDepends(
@@ -577,7 +576,7 @@ public:
   std::string GetPDBOutputName(const std::string& config) const;
   std::string GetPDBOutputName(const std::string& config) const;
 
 
   /** Get the name of the pdb file for the target.  */
   /** Get the name of the pdb file for the target.  */
-  std::string GetPDBName(const std::string& config = "") const;
+  std::string GetPDBName(const std::string& config) const;
 
 
   /** Whether this library has soname enabled and platform supports it.  */
   /** Whether this library has soname enabled and platform supports it.  */
   bool HasSOName(const std::string& config) const;
   bool HasSOName(const std::string& config) const;
@@ -595,10 +594,10 @@ public:
   bool IsNullImpliedByLinkLibraries(const std::string& p) const;
   bool IsNullImpliedByLinkLibraries(const std::string& p) const;
 
 
   /** Get the name of the compiler pdb file for the target.  */
   /** Get the name of the compiler pdb file for the target.  */
-  std::string GetCompilePDBName(const std::string& config = "") const;
+  std::string GetCompilePDBName(const std::string& config) const;
 
 
   /** Get the path for the MSVC /Fd option for this target.  */
   /** Get the path for the MSVC /Fd option for this target.  */
-  std::string GetCompilePDBPath(const std::string& config = "") const;
+  std::string GetCompilePDBPath(const std::string& config) const;
 
 
   // Get the target base name.
   // Get the target base name.
   std::string GetOutputName(const std::string& config,
   std::string GetOutputName(const std::string& config,

+ 1 - 1
Source/cmNinjaNormalTargetGenerator.cxx

@@ -1024,7 +1024,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
     std::string prefix;
     std::string prefix;
     std::string base;
     std::string base;
     std::string suffix;
     std::string suffix;
-    gt->GetFullNameComponents(prefix, base, suffix);
+    gt->GetFullNameComponents(prefix, base, suffix, config);
     std::string dbg_suffix = ".dbg";
     std::string dbg_suffix = ".dbg";
     // TODO: Where to document?
     // TODO: Where to document?
     if (mf->GetDefinition("CMAKE_DEBUG_SYMBOL_SUFFIX")) {
     if (mf->GetDefinition("CMAKE_DEBUG_SYMBOL_SUFFIX")) {

+ 2 - 1
Source/cmXCodeScheme.cxx

@@ -396,7 +396,8 @@ void cmXCodeScheme::WriteBuildableReference(cmXMLWriter& xout,
   xout.BreakAttributes();
   xout.BreakAttributes();
   xout.Attribute("BuildableIdentifier", "primary");
   xout.Attribute("BuildableIdentifier", "primary");
   xout.Attribute("BlueprintIdentifier", xcObj->GetId());
   xout.Attribute("BlueprintIdentifier", xcObj->GetId());
-  xout.Attribute("BuildableName", xcObj->GetTarget()->GetFullName());
+  std::string const noConfig; // FIXME: What config to use here?
+  xout.Attribute("BuildableName", xcObj->GetTarget()->GetFullName(noConfig));
   xout.Attribute("BlueprintName", xcObj->GetTarget()->GetName());
   xout.Attribute("BlueprintName", xcObj->GetTarget()->GetName());
   xout.Attribute("ReferencedContainer", "container:" + container);
   xout.Attribute("ReferencedContainer", "container:" + container);
   xout.EndElement();
   xout.EndElement();