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.h | |
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.h')
-rw-r--r-- | Source/cmMakefile.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index e165fd8..4019372 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -263,9 +263,10 @@ public: /** * Add a subdirectory to the build. */ - void AddSubDirectory(const char*, bool excludeFromAll=false, + void AddSubDirectory(const std::string&, bool excludeFromAll=false, bool preorder = false); - void AddSubDirectory(const char* fullSrcDir,const char *fullBinDir, + void AddSubDirectory(const std::string& fullSrcDir, + const std::string& fullBinDir, bool excludeFromAll, bool preorder, bool immediate); @@ -430,7 +431,7 @@ public: * recursing up the tree starting at the StartDirectory and going up until * it reaches the HomeDirectory. */ - void SetStartDirectory(const char* dir) + void SetStartDirectory(const std::string& dir) { this->cmStartDirectory = dir; cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory); @@ -443,7 +444,7 @@ public: { return this->cmStartDirectory.c_str(); } - void SetStartOutputDirectory(const char* lib) + void SetStartOutputDirectory(const std::string& lib) { this->StartOutputDirectory = lib; cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory); @@ -949,7 +950,8 @@ private: bool ParseDefineFlag(std::string const& definition, bool remove); - bool EnforceUniqueDir(const char* srcPath, const char* binPath) const; + bool EnforceUniqueDir(const std::string& srcPath, + const std::string& binPath) const; friend class cmMakeDepend; // make depend needs direct access // to the Sources array |