summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-09-24 14:30:57 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-09-24 14:32:43 (GMT)
commit13c7a16cde47b4c5fc2bf62f9bfc497b123e9c94 (patch)
tree6f1c8cf701c7bc9def54e731dd06a9b22ad0c470
parenta6093ed18d323741c48b6c3e72c4b94c05914731 (diff)
parentf4afcd5c6bee7604e031aaab2fa38a9e9ba93900 (diff)
downloadCMake-13c7a16cde47b4c5fc2bf62f9bfc497b123e9c94.zip
CMake-13c7a16cde47b4c5fc2bf62f9bfc497b123e9c94.tar.gz
CMake-13c7a16cde47b4c5fc2bf62f9bfc497b123e9c94.tar.bz2
Merge topic 'miscellaneous-refactorings'
f4afcd5c6b VS: Remove call to ConvertToWindowsExtendedPath with result discarded 61fdf326d8 cmState: Avoid lowering command name twice 0965bd9c06 Generators: Remove function declarations which do not have a definition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3847
-rw-r--r--Source/cmGlobalGenerator.h2
-rw-r--r--Source/cmGlobalVisualStudioGenerator.cxx1
-rw-r--r--Source/cmLocalNinjaGenerator.h1
-rw-r--r--Source/cmState.cxx2
4 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 372e658..3075c1a 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -555,8 +555,6 @@ protected:
cmTarget* FindTargetImpl(std::string const& name) const;
cmGeneratorTarget* FindGeneratorTargetImpl(std::string const& name) const;
- cmGeneratorTarget* FindImportedGeneratorTargetImpl(
- std::string const& name) const;
const char* GetPredefinedTargetsFolder();
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 61e8f58..108a44f 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -901,7 +901,6 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
gt->LocalGenerator->ComputeObjectFilenames(mapping, gt);
std::string obj_dir = gt->ObjectDirectory;
std::string cmakeCommand = cmSystemTools::GetCMakeCommand();
- cmSystemTools::ConvertToWindowsExtendedPath(cmakeCommand);
std::string obj_dir_expanded = obj_dir;
cmSystemTools::ReplaceString(obj_dir_expanded, this->GetCMakeCFGIntDir(),
configName.c_str());
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index 08bec70..f64534c 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -93,7 +93,6 @@ private:
void WriteProcessedMakefile(std::ostream& os);
void WritePools(std::ostream& os);
- void WriteCustomCommandRule();
void WriteCustomCommandBuildStatement(cmCustomCommand const* cc,
const cmNinjaDeps& orderOnlyDeps);
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 93ad2d7..6de312c 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -503,7 +503,7 @@ void cmState::AddScriptedCommand(std::string const& name, Command command)
std::string sName = cmSystemTools::LowerCase(name);
// if the command already exists, give a new name to the old command.
- if (Command oldCmd = this->GetCommand(sName)) {
+ if (Command oldCmd = this->GetCommandByExactName(sName)) {
this->ScriptedCommands["_" + sName] = oldCmd;
}