kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmOutputConverter: remove unused 'local' argument

This commit is contained in:
Daniel Pfeifer 2016-06-20 23:03:28 +02:00
parent b86007e385
commit 191fc3a0f3
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalGenerator.cxx
View File

@ -832,8 +832,8 @@ void cmLocalGenerator::InsertRuleLauncher(std::string& s,
std::string cmLocalGenerator::ConvertToIncludeReference( std::string cmLocalGenerator::ConvertToIncludeReference(
std::string const& path, OutputFormat format, bool forceFullPaths) std::string const& path, OutputFormat format, bool forceFullPaths)
{ {
return this->ConvertToOutputForExisting( static_cast<void>(forceFullPaths);
path, forceFullPaths ? FULL : START_OUTPUT, format); return this->ConvertToOutputForExisting(path, format);
} }
std::string cmLocalGenerator::GetIncludeFlags( std::string cmLocalGenerator::GetIncludeFlags(
@ -1503,7 +1503,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
for (std::vector<std::string>::const_iterator libDir = libDirs.begin(); for (std::vector<std::string>::const_iterator libDir = libDirs.begin();
libDir != libDirs.end(); ++libDir) { libDir != libDirs.end(); ++libDir) {
std::string libpath = std::string libpath =
this->ConvertToOutputForExisting(*libDir, START_OUTPUT, shellFormat); this->ConvertToOutputForExisting(*libDir, shellFormat);
linkPath += " " + libPathFlag; linkPath += " " + libPathFlag;
linkPath += libpath; linkPath += libpath;
linkPath += libPathTerminator; linkPath += libPathTerminator;

7
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -2068,19 +2068,18 @@ void cmLocalUnixMakefileGenerator3::CreateCDCommand(
// back because the shell keeps the working directory between // back because the shell keeps the working directory between
// commands. // commands.
std::string cmd = cd_cmd; std::string cmd = cd_cmd;
cmd += this->ConvertToOutputForExisting(tgtDir, relRetDir); cmd += this->ConvertToOutputForExisting(tgtDir);
commands.insert(commands.begin(), cmd); commands.insert(commands.begin(), cmd);
// Change back to the starting directory. // Change back to the starting directory.
cmd = cd_cmd; cmd = cd_cmd;
cmd += this->ConvertToOutputForExisting(relRetDir, tgtDir); cmd += this->ConvertToOutputForExisting(relRetDir);
commands.push_back(cmd); commands.push_back(cmd);
} else { } else {
// On UNIX we must construct a single shell command to change // On UNIX we must construct a single shell command to change
// directory and build because make resets the directory between // directory and build because make resets the directory between
// each command. // each command.
std::string outputForExisting = std::string outputForExisting = this->ConvertToOutputForExisting(tgtDir);
this->ConvertToOutputForExisting(tgtDir, relRetDir);
std::string prefix = cd_cmd + outputForExisting + " && "; std::string prefix = cd_cmd + outputForExisting + " && ";
std::transform(commands.begin(), commands.end(), commands.begin(), std::transform(commands.begin(), commands.end(), commands.begin(),
std::bind1st(std::plus<std::string>(), prefix)); std::bind1st(std::plus<std::string>(), prefix));

8
Source/cmOutputConverter.cxx
View File

@ -47,10 +47,8 @@ std::string cmOutputConverter::ConvertToOutputForExistingCommon(
} }
std::string cmOutputConverter::ConvertToOutputForExisting( std::string cmOutputConverter::ConvertToOutputForExisting(
const std::string& remote, RelativeRoot local, OutputFormat format) const const std::string& remote, OutputFormat format) const
{ {
static_cast<void>(local);
// Perform standard conversion. // Perform standard conversion.
std::string result = this->ConvertToOutputFormat(remote, format); std::string result = this->ConvertToOutputFormat(remote, format);
@ -59,10 +57,8 @@ std::string cmOutputConverter::ConvertToOutputForExisting(
} }
std::string cmOutputConverter::ConvertToOutputForExisting( std::string cmOutputConverter::ConvertToOutputForExisting(
RelativeRoot remote, const std::string& local, OutputFormat format) const RelativeRoot remote, OutputFormat format) const
{ {
static_cast<void>(local);
// The relative root must have a path (i.e. not FULL or NONE) // The relative root must have a path (i.e. not FULL or NONE)
assert(remote != FULL); assert(remote != FULL);
assert(remote != NONE); assert(remote != NONE);

2
Source/cmOutputConverter.h
View File

@ -69,13 +69,11 @@ public:
///! for existing files convert to output path and short path if spaces ///! for existing files convert to output path and short path if spaces
std::string ConvertToOutputForExisting(const std::string& remote, std::string ConvertToOutputForExisting(const std::string& remote,
RelativeRoot local = START_OUTPUT,
OutputFormat format = SHELL) const; OutputFormat format = SHELL) const;
/** For existing path identified by RelativeRoot convert to output /** For existing path identified by RelativeRoot convert to output
path and short path if spaces. */ path and short path if spaces. */
std::string ConvertToOutputForExisting(RelativeRoot remote, std::string ConvertToOutputForExisting(RelativeRoot remote,
const std::string& local = "",
OutputFormat format = SHELL) const; OutputFormat format = SHELL) const;
void SetLinkScriptShell(bool linkScriptShell); void SetLinkScriptShell(bool linkScriptShell);