diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-02-24 22:38:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-08 18:05:38 (GMT) |
| commit | 6557382dcffef8ed6b11394cb65775d82f1c0aa7 (patch) | |
| tree | df6ca4b09a1eabc6dc4033c8d640ada1ddc8623c /Source/cmGlobalGenerator.h | |
| parent | 1a1b737c99ac0bd0d555fde2fadf77f08516a4ea (diff) | |
| download | CMake-6557382dcffef8ed6b11394cb65775d82f1c0aa7.zip CMake-6557382dcffef8ed6b11394cb65775d82f1c0aa7.tar.gz CMake-6557382dcffef8ed6b11394cb65775d82f1c0aa7.tar.bz2 | |
stringapi: Use strings for program paths
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 38dc63a..91e71a8 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -120,7 +120,7 @@ public: int Build(const std::string& srcdir, const std::string& bindir, const std::string& projectName, const std::string& targetName, std::string *output, - const char *makeProgram, const std::string& config, + const std::string& makeProgram, const std::string& config, bool clean, bool fast, double timeout, cmSystemTools::OutputOption outputflag=cmSystemTools::OUTPUT_NONE, @@ -129,7 +129,7 @@ public: virtual void GenerateBuildCommand( std::vector<std::string>& makeCommand, - const char* makeProgram, + const std::string& makeProgram, const std::string& projectName, const std::string& projectDir, const std::string& targetName, const std::string& config, bool fast, std::vector<std::string> const& makeOptions = std::vector<std::string>() @@ -345,8 +345,8 @@ protected: cmTarget const*> > AutogensType; void CreateQtAutoGeneratorsTargets(AutogensType& autogens); - std::string SelectMakeProgram(const char* makeProgram, - std::string makeDefault = "") const; + std::string SelectMakeProgram(const std::string& makeProgram, + const std::string& makeDefault = "") const; // Fill the ProjectMap, this must be called after LocalGenerators // has been populated. |