diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-16 20:18:04 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-20 22:12:51 (GMT) |
| commit | 1ea085d1b62f02d4e556ce1fabb0589e30108e20 (patch) | |
| tree | b1c52adbc110c5784822bf7adaf47fd4912e8dde | |
| parent | f034bb2f54f784461ed1adea8f0554d49ff5b0b3 (diff) | |
| download | CMake-1ea085d1b62f02d4e556ce1fabb0589e30108e20.zip CMake-1ea085d1b62f02d4e556ce1fabb0589e30108e20.tar.gz CMake-1ea085d1b62f02d4e556ce1fabb0589e30108e20.tar.bz2 | |
cmMakefile: Initialize dir definitions early.
| -rw-r--r-- | Source/cmMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6c2b8b2..23c2e48 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1543,6 +1543,11 @@ void cmMakefile::InitializeFromParent() // Initialize definitions with the closure of the parent scope. this->Internal->VarStack.top() = parent->Internal->VarStack.top().Closure(); + this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", + this->cmStartDirectory.c_str()); + this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", + this->StartOutputDirectory.c_str()); + const std::vector<cmValueWithOrigin>& parentIncludes = parent->GetIncludeDirectoriesEntries(); this->IncludeDirectoriesEntries.insert(this->IncludeDirectoriesEntries.end(), @@ -1611,7 +1616,6 @@ void cmMakefile::InitializeFromParent() void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2) { lg2->GetMakefile()->InitializeFromParent(); - lg2->GetMakefile()->MakeStartDirectoriesCurrent(); if (this->GetCMakeInstance()->GetDebugOutput()) { std::string msg=" Entering "; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 8da2ccd..356e4c2 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -423,14 +423,6 @@ public: bool HasCMP0054AlreadyBeenReported( cmListFileContext context) const; - void MakeStartDirectoriesCurrent() - { - this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", - this->cmStartDirectory.c_str()); - this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", - this->StartOutputDirectory.c_str()); - } - //@{ /** * Set/Get the home directory (or output directory) in the project. The |