ninja: Use string parameters
This commit is contained in:
parent
9442928745
commit
3c64089117
|
@ -294,7 +294,7 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
|
|||
os << std::endl;
|
||||
}
|
||||
|
||||
std::string cmLocalNinjaGenerator::ConvertToNinjaPath(const char *path)
|
||||
std::string cmLocalNinjaGenerator::ConvertToNinjaPath(const std::string& path)
|
||||
{
|
||||
std::string convPath = this->Convert(path, cmLocalGenerator::HOME_OUTPUT);
|
||||
#ifdef _WIN32
|
||||
|
|
|
@ -67,7 +67,7 @@ public:
|
|||
std::string GetHomeRelativeOutputPath() const
|
||||
{ return this->HomeRelativeOutputPath; }
|
||||
|
||||
std::string ConvertToNinjaPath(const char *path);
|
||||
std::string ConvertToNinjaPath(const std::string& path);
|
||||
|
||||
struct map_to_ninja_path {
|
||||
cmLocalNinjaGenerator *LocalGenerator;
|
||||
|
|
|
@ -760,9 +760,10 @@ cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
|
|||
this->Generator->GetGlobalGenerator()->AddDependencyToAll(output);
|
||||
}
|
||||
|
||||
void cmNinjaTargetGenerator::addPoolNinjaVariable(const char* pool_property,
|
||||
cmTarget* target,
|
||||
cmNinjaVars& vars)
|
||||
void cmNinjaTargetGenerator::addPoolNinjaVariable(
|
||||
const std::string& pool_property,
|
||||
cmTarget* target,
|
||||
cmNinjaVars& vars)
|
||||
{
|
||||
const char* pool = target->GetProperty(pool_property);
|
||||
if (pool)
|
||||
|
|
|
@ -85,7 +85,7 @@ protected:
|
|||
std::string ComputeDefines(cmSourceFile const* source,
|
||||
const std::string& language);
|
||||
|
||||
std::string ConvertToNinjaPath(const char *path) const {
|
||||
std::string ConvertToNinjaPath(const std::string& path) const {
|
||||
return this->GetLocalGenerator()->ConvertToNinjaPath(path);
|
||||
}
|
||||
cmLocalNinjaGenerator::map_to_ninja_path MapToNinjaPath() const {
|
||||
|
@ -142,7 +142,7 @@ protected:
|
|||
cmOSXBundleGenerator* OSXBundleGenerator;
|
||||
std::set<std::string> MacContentFolders;
|
||||
|
||||
void addPoolNinjaVariable(const char* pool_property,
|
||||
void addPoolNinjaVariable(const std::string& pool_property,
|
||||
cmTarget* target,
|
||||
cmNinjaVars& vars);
|
||||
|
||||
|
|
Loading…
Reference in New Issue