diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-12 17:34:06 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-13 22:34:11 (GMT) |
| commit | 2bf7de167f0b72b07c6246679c964d83cdc47d45 (patch) | |
| tree | e2a9b990f9134adeeac21b58e61c6e103a1eb9a6 /Source/cmState.cxx | |
| parent | 0aa34de5493732d219dd3f58634222677bd19e22 (diff) | |
| download | CMake-2bf7de167f0b72b07c6246679c964d83cdc47d45.zip CMake-2bf7de167f0b72b07c6246679c964d83cdc47d45.tar.gz CMake-2bf7de167f0b72b07c6246679c964d83cdc47d45.tar.bz2 | |
Subdirs: Initialize from parent before configuring.
Add new API for the subdirs command to cmState.
This fixes a regression introduced in commit f716460e (cmMakefile: Move
invokation to initialize snapshot., 2015-10-06).
Diffstat (limited to 'Source/cmState.cxx')
| -rw-r--r-- | Source/cmState.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 01fd4e2..825204c 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -1447,6 +1447,20 @@ std::string cmState::Snapshot::GetProjectName() const return this->Position->BuildSystemDirectory->ProjectName; } +void cmState::Snapshot::InitializeFromParent_ForSubdirsCommand() +{ + std::string currentSrcDir = this->GetDefinition("CMAKE_CURRENT_SOURCE_DIR"); + std::string currentBinDir = this->GetDefinition("CMAKE_CURRENT_BINARY_DIR"); + this->InitializeFromParent(); + this->SetDefinition("CMAKE_SOURCE_DIR", + this->State->GetSourceDirectory()); + this->SetDefinition("CMAKE_BINARY_DIR", + this->State->GetBinaryDirectory()); + + this->SetDefinition("CMAKE_CURRENT_SOURCE_DIR", currentSrcDir.c_str()); + this->SetDefinition("CMAKE_CURRENT_BINARY_DIR", currentBinDir.c_str()); +} + cmState::Directory::Directory( cmLinkedTree<BuildsystemDirectoryStateType>::iterator iter, const cmState::Snapshot& snapshot) |