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

Directories: Take strings when setting directories

This commit is contained in:
Ben Boeckel 2014-02-07 15:24:15 -05:00 committed by Brad King
parent 270eb96df0
commit f0ad6631ad
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmake.cxx
View File

@ -1069,13 +1069,13 @@ cmGlobalGenerator* cmake::CreateGlobalGenerator(const char* name)
return generator; return generator;
} }
void cmake::SetHomeDirectory(const char* dir) void cmake::SetHomeDirectory(const std::string& dir)
{ {
this->cmHomeDirectory = dir; this->cmHomeDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->cmHomeDirectory); cmSystemTools::ConvertToUnixSlashes(this->cmHomeDirectory);
} }
void cmake::SetHomeOutputDirectory(const char* lib) void cmake::SetHomeOutputDirectory(const std::string& lib)
{ {
this->HomeOutputDirectory = lib; this->HomeOutputDirectory = lib;
cmSystemTools::ConvertToUnixSlashes(this->HomeOutputDirectory); cmSystemTools::ConvertToUnixSlashes(this->HomeOutputDirectory);

8
Source/cmake.h
View File

@ -110,12 +110,12 @@ class cmake
* CMakeLists files by recursing up the tree starting at the StartDirectory * CMakeLists files by recursing up the tree starting at the StartDirectory
* and going up until it reaches the HomeDirectory. * and going up until it reaches the HomeDirectory.
*/ */
void SetHomeDirectory(const char* dir); void SetHomeDirectory(const std::string& dir);
const char* GetHomeDirectory() const const char* GetHomeDirectory() const
{ {
return this->cmHomeDirectory.c_str(); return this->cmHomeDirectory.c_str();
} }
void SetHomeOutputDirectory(const char* lib); void SetHomeOutputDirectory(const std::string& lib);
const char* GetHomeOutputDirectory() const const char* GetHomeOutputDirectory() const
{ {
return this->HomeOutputDirectory.c_str(); return this->HomeOutputDirectory.c_str();
@ -130,7 +130,7 @@ class cmake
* recursing up the tree starting at the StartDirectory and going up until * recursing up the tree starting at the StartDirectory and going up until
* it reaches the HomeDirectory. * it reaches the HomeDirectory.
*/ */
void SetStartDirectory(const char* dir) void SetStartDirectory(const std::string& dir)
{ {
this->cmStartDirectory = dir; this->cmStartDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory); cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory);
@ -139,7 +139,7 @@ class cmake
{ {
return this->cmStartDirectory.c_str(); return this->cmStartDirectory.c_str();
} }
void SetStartOutputDirectory(const char* lib) void SetStartOutputDirectory(const std::string& lib)
{ {
this->StartOutputDirectory = lib; this->StartOutputDirectory = lib;
cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory); cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);