summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-08-27 11:44:55 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-08-27 13:26:36 (GMT)
commitac46384171c54a0fb9c47c32642fbca4ff1e925b (patch)
tree2bb928672c28c4d42687694ddd16a224516bc398 /Source/cmLocalGenerator.cxx
parent998d9ee967f6795c71ff23cf16601f7e974b21ba (diff)
downloadCMake-ac46384171c54a0fb9c47c32642fbca4ff1e925b.zip
CMake-ac46384171c54a0fb9c47c32642fbca4ff1e925b.tar.gz
CMake-ac46384171c54a0fb9c47c32642fbca4ff1e925b.tar.bz2
Convert: Replace uses of Convert(NONE)
These are equivalent to ConvertToOutputFormat.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d8f6bdf..20a1e21 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1393,7 +1393,7 @@ std::string cmLocalGenerator::ConvertToLinkReference(std::string const& lib,
sp += lib.substr(pos);
// Convert to an output path.
- return this->Convert(sp.c_str(), NONE, format);
+ return this->ConvertToOutputFormat(sp.c_str(), format);
}
}
}
@@ -1489,7 +1489,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
for (std::vector<std::string>::const_iterator fdi = fwDirs.begin();
fdi != fwDirs.end(); ++fdi) {
frameworkPath += fwSearchFlag;
- frameworkPath += this->Convert(*fdi, NONE, shellFormat);
+ frameworkPath += this->ConvertToOutputFormat(*fdi, shellFormat);
frameworkPath += " ";
}
}
@@ -1535,7 +1535,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
for (std::vector<std::string>::iterator ri = runtimeDirs.begin();
ri != runtimeDirs.end(); ++ri) {
rpath += cli.GetRuntimeFlag();
- rpath += this->Convert(*ri, NONE, shellFormat);
+ rpath += this->ConvertToOutputFormat(*ri, shellFormat);
rpath += " ";
}
fout << rpath;
@@ -1605,7 +1605,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
flags += " ";
flags += sysrootFlag;
flags += " ";
- flags += this->Convert(sysroot, NONE, SHELL);
+ flags += this->ConvertToOutputFormat(sysroot, SHELL);
}
if (deploymentTargetFlag && *deploymentTargetFlag && deploymentTarget &&