diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-18 15:18:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-18 15:18:57 (GMT) |
| commit | fc74fcc853641c3369670a15811b38c818d6b840 (patch) | |
| tree | 10689868acba5066b2e19b8c8445e91095cc55a5 | |
| parent | a8f628c0a456f74680bfdad0050f2614dbe50853 (diff) | |
| parent | 53ad52d66d2056a4bf797d22ce1d3ee5395679a6 (diff) | |
| download | CMake-fc74fcc853641c3369670a15811b38c818d6b840.zip CMake-fc74fcc853641c3369670a15811b38c818d6b840.tar.gz CMake-fc74fcc853641c3369670a15811b38c818d6b840.tar.bz2 | |
Merge topic 'link-options'
53ad52d66d LINK_OPTIONS: Add missing initialization actions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2395
| -rw-r--r-- | Source/cmState.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index c8b8653..c6667f6 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -659,6 +659,7 @@ cmStateSnapshot cmState::CreateBaseSnapshot() pos->IncludeDirectoryPosition = 0; pos->CompileDefinitionsPosition = 0; pos->CompileOptionsPosition = 0; + pos->LinkOptionsPosition = 0; pos->BuildSystemDirectory->DirectoryEnd = pos; pos->Policies = this->PolicyStack.Root(); pos->PolicyRoot = this->PolicyStack.Root(); @@ -810,6 +811,8 @@ cmStateSnapshot cmState::Pop(cmStateSnapshot const& originSnapshot) prevPos->BuildSystemDirectory->CompileDefinitions.size(); prevPos->CompileOptionsPosition = prevPos->BuildSystemDirectory->CompileOptions.size(); + prevPos->LinkOptionsPosition = + prevPos->BuildSystemDirectory->LinkOptions.size(); prevPos->BuildSystemDirectory->DirectoryEnd = prevPos; if (!pos->Keep && this->SnapshotData.IsLast(pos)) { |