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

cmMakefile: Fix wrong parameter names.

This commit is contained in:
Stephen Kelly 2015-04-16 00:19:35 +02:00
parent f438cd3731
commit 3a68c323ba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMakefile.cxx
View File

@ -3408,9 +3408,9 @@ const char* cmMakefile::GetHomeOutputDirectory() const
return this->HomeOutputDirectory.c_str(); return this->HomeOutputDirectory.c_str();
} }
void cmMakefile::SetHomeOutputDirectory(const std::string& lib) void cmMakefile::SetHomeOutputDirectory(const std::string& dir)
{ {
this->HomeOutputDirectory = lib; this->HomeOutputDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->HomeOutputDirectory); cmSystemTools::ConvertToUnixSlashes(this->HomeOutputDirectory);
this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory()); this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory());
if ( !this->GetDefinition("CMAKE_CURRENT_BINARY_DIR") ) if ( !this->GetDefinition("CMAKE_CURRENT_BINARY_DIR") )

6
Source/cmMakefile.h
View File

@ -441,7 +441,7 @@ public:
*/ */
void SetHomeDirectory(const std::string& dir); void SetHomeDirectory(const std::string& dir);
const char* GetHomeDirectory() const; const char* GetHomeDirectory() const;
void SetHomeOutputDirectory(const std::string& lib); void SetHomeOutputDirectory(const std::string& dir);
const char* GetHomeOutputDirectory() const; const char* GetHomeOutputDirectory() const;
//@} //@}
@ -476,9 +476,9 @@ public:
{ {
return this->cmStartDirectory.c_str(); return this->cmStartDirectory.c_str();
} }
void SetStartOutputDirectory(const std::string& lib) void SetStartOutputDirectory(const std::string& dir)
{ {
this->StartOutputDirectory = lib; this->StartOutputDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory); cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);
this->StartOutputDirectory = this->StartOutputDirectory =
cmSystemTools::CollapseFullPath(this->StartOutputDirectory); cmSystemTools::CollapseFullPath(this->StartOutputDirectory);