diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-22 18:52:02 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-25 12:53:06 (GMT) |
| commit | bbb507aebcb3559ae6e7d34ef02443e2d6ec3869 (patch) | |
| tree | aa7c72bb9c61e1ffd35852971962ac88181caf13 /Source/cmMakefile.cxx | |
| parent | 6ed9c7e024d66d89ab303ba0d299fa4ee099f91b (diff) | |
| download | CMake-bbb507aebcb3559ae6e7d34ef02443e2d6ec3869.zip CMake-bbb507aebcb3559ae6e7d34ef02443e2d6ec3869.tar.gz CMake-bbb507aebcb3559ae6e7d34ef02443e2d6ec3869.tar.bz2 | |
cmMakefile: Move the InitializeFromParent method
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c54f972..9a28c7c 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1554,13 +1554,13 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent) // Initialize definitions with the closure of the parent scope. this->Internal->InitializeDefinitions(parent); + this->StateSnapshot.InitializeFromParent(); + this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", this->GetCurrentSourceDirectory()); this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", this->GetCurrentBinaryDirectory()); - this->StateSnapshot.InitializeFromParent(); - this->SystemIncludeDirectories = parent->SystemIncludeDirectories; // define flags |