diff options
| -rw-r--r-- | Source/cmMakefile.cxx | 38 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 11 |
2 files changed, 17 insertions, 32 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c8b6849..4c68849 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -651,9 +651,23 @@ void cmMakefile::SetLocalGenerator(cmLocalGenerator* lg) this->Properties.SetCMakeInstance(this->GetCMakeInstance()); this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused(); this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars(); - this->SetHomeDirectory(this->GetCMakeInstance()->GetHomeDirectory()); - this->SetHomeOutputDirectory( - this->GetCMakeInstance()->GetHomeOutputDirectory()); + + { + const char* dir = this->GetCMakeInstance()->GetHomeDirectory(); + this->AddDefinition("CMAKE_SOURCE_DIR", dir); + if ( !this->GetDefinition("CMAKE_CURRENT_SOURCE_DIR") ) + { + this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir); + } + } + { + const char* dir = this->GetCMakeInstance()->GetHomeOutputDirectory(); + this->AddDefinition("CMAKE_BINARY_DIR", dir); + if ( !this->GetDefinition("CMAKE_CURRENT_BINARY_DIR") ) + { + this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir); + } + } } namespace @@ -3385,29 +3399,11 @@ const char* cmMakefile::GetHomeDirectory() const return this->GetCMakeInstance()->GetHomeDirectory(); } -void cmMakefile::SetHomeDirectory(const std::string& dir) -{ - this->AddDefinition("CMAKE_SOURCE_DIR", dir.c_str()); - if ( !this->GetDefinition("CMAKE_CURRENT_SOURCE_DIR") ) - { - this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir.c_str()); - } -} - const char* cmMakefile::GetHomeOutputDirectory() const { return this->GetCMakeInstance()->GetHomeOutputDirectory(); } -void cmMakefile::SetHomeOutputDirectory(const std::string& dir) -{ - this->AddDefinition("CMAKE_BINARY_DIR", dir.c_str()); - if ( !this->GetDefinition("CMAKE_CURRENT_BINARY_DIR") ) - { - this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir.c_str()); - } -} - void cmMakefile::SetScriptModeFile(const char* scriptfile) { this->AddDefinition("CMAKE_SCRIPT_MODE_FILE", scriptfile); diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 8c5ccc9..dcf56e1 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -422,19 +422,8 @@ public: bool HasCMP0054AlreadyBeenReported( cmListFileContext context) const; - //@{ - /** - * Set/Get the home directory (or output directory) in the project. The - * home directory is the top directory of the project. It is where - * CMakeSetup or configure was run. Remember that CMake processes - * CMakeLists files by recursing up the tree starting at the StartDirectory - * and going up until it reaches the HomeDirectory. - */ - void SetHomeDirectory(const std::string& dir); const char* GetHomeDirectory() const; - void SetHomeOutputDirectory(const std::string& dir); const char* GetHomeOutputDirectory() const; - //@} /** * Set CMAKE_SCRIPT_MODE_FILE variable when running a -P script. |