diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-02-07 20:33:35 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-03-08 18:05:32 (GMT) |
commit | adcd812917fe37798a3062bfb3a0932e128faec2 (patch) | |
tree | a122c08a2ea8654244d8821ed1db21437ca5cdbd /Source/cmMakefile.cxx | |
parent | 30bc251b65e9deb39c2cb8a785bd98c8d707d508 (diff) | |
download | CMake-adcd812917fe37798a3062bfb3a0932e128faec2.zip CMake-adcd812917fe37798a3062bfb3a0932e128faec2.tar.gz CMake-adcd812917fe37798a3062bfb3a0932e128faec2.tar.bz2 |
stringapi: Use strings for AddSubdirectory paths
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8b1f0ba..1df64dd 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1648,7 +1648,7 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2) } } -void cmMakefile::AddSubDirectory(const char* sub, +void cmMakefile::AddSubDirectory(const std::string& sub, bool excludeFromAll, bool preorder) { // the source path must be made full if it isn't already @@ -1675,7 +1675,8 @@ void cmMakefile::AddSubDirectory(const char* sub, } -void cmMakefile::AddSubDirectory(const char* srcPath, const char *binPath, +void cmMakefile::AddSubDirectory(const std::string& srcPath, + const std::string& binPath, bool excludeFromAll, bool preorder, bool immediate) { @@ -4185,8 +4186,8 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg, } //---------------------------------------------------------------------------- -bool cmMakefile::EnforceUniqueDir(const char* srcPath, - const char* binPath) const +bool cmMakefile::EnforceUniqueDir(const std::string& srcPath, + const std::string& binPath) const { // Make sure the binary directory is unique. cmGlobalGenerator* gg = this->LocalGenerator->GetGlobalGenerator(); |