diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-05 22:04:30 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-06 19:46:09 (GMT) |
| commit | f716460ed82134bd1ca09f49bfa507cb2645d96c (patch) | |
| tree | 3bdd00b1328419b8a52ad12fd2ad2671144bc647 | |
| parent | 256bf8876a2e460afc37dbe17eb34482944be20b (diff) | |
| download | CMake-f716460ed82134bd1ca09f49bfa507cb2645d96c.zip CMake-f716460ed82134bd1ca09f49bfa507cb2645d96c.tar.gz CMake-f716460ed82134bd1ca09f49bfa507cb2645d96c.tar.bz2 | |
cmMakefile: Move invokation to initialize snapshot.
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 077470d..e522320 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1472,8 +1472,6 @@ void cmMakefile::AddLinkLibrary(const std::string& lib) void cmMakefile::InitializeFromParent(cmMakefile* parent) { - this->StateSnapshot.InitializeFromParent(); - this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", this->GetCurrentSourceDirectory()); this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", @@ -1755,6 +1753,9 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, // set the subdirs start dirs subMf->SetCurrentSourceDirectory(srcPath); subMf->SetCurrentBinaryDirectory(binPath); + + subMf->StateSnapshot.InitializeFromParent(); + if(excludeFromAll) { subMf->SetProperty("EXCLUDE_FROM_ALL", "TRUE"); |