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

ninja: Use string parameters

This commit is contained in:
Ben Boeckel 2014-03-10 18:32:00 -04:00
parent 9442928745
commit 3c64089117
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalNinjaGenerator.cxx
View File

@ -294,7 +294,7 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
os << std::endl; 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); std::string convPath = this->Convert(path, cmLocalGenerator::HOME_OUTPUT);
#ifdef _WIN32 #ifdef _WIN32

2
Source/cmLocalNinjaGenerator.h
View File

@ -67,7 +67,7 @@ public:
std::string GetHomeRelativeOutputPath() const std::string GetHomeRelativeOutputPath() const
{ return this->HomeRelativeOutputPath; } { return this->HomeRelativeOutputPath; }
std::string ConvertToNinjaPath(const char *path); std::string ConvertToNinjaPath(const std::string& path);
struct map_to_ninja_path { struct map_to_ninja_path {
cmLocalNinjaGenerator *LocalGenerator; cmLocalNinjaGenerator *LocalGenerator;

7
Source/cmNinjaTargetGenerator.cxx
View File

@ -760,9 +760,10 @@ cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
this->Generator->GetGlobalGenerator()->AddDependencyToAll(output); this->Generator->GetGlobalGenerator()->AddDependencyToAll(output);
} }
void cmNinjaTargetGenerator::addPoolNinjaVariable(const char* pool_property, void cmNinjaTargetGenerator::addPoolNinjaVariable(
cmTarget* target, const std::string& pool_property,
cmNinjaVars& vars) cmTarget* target,
cmNinjaVars& vars)
{ {
const char* pool = target->GetProperty(pool_property); const char* pool = target->GetProperty(pool_property);
if (pool) if (pool)

4
Source/cmNinjaTargetGenerator.h
View File

@ -85,7 +85,7 @@ protected:
std::string ComputeDefines(cmSourceFile const* source, std::string ComputeDefines(cmSourceFile const* source,
const std::string& language); const std::string& language);
std::string ConvertToNinjaPath(const char *path) const { std::string ConvertToNinjaPath(const std::string& path) const {
return this->GetLocalGenerator()->ConvertToNinjaPath(path); return this->GetLocalGenerator()->ConvertToNinjaPath(path);
} }
cmLocalNinjaGenerator::map_to_ninja_path MapToNinjaPath() const { cmLocalNinjaGenerator::map_to_ninja_path MapToNinjaPath() const {
@ -142,7 +142,7 @@ protected:
cmOSXBundleGenerator* OSXBundleGenerator; cmOSXBundleGenerator* OSXBundleGenerator;
std::set<std::string> MacContentFolders; std::set<std::string> MacContentFolders;
void addPoolNinjaVariable(const char* pool_property, void addPoolNinjaVariable(const std::string& pool_property,
cmTarget* target, cmTarget* target,
cmNinjaVars& vars); cmNinjaVars& vars);