diff options
author | Brad King <brad.king@kitware.com> | 2020-07-13 11:55:22 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-07-13 11:56:13 (GMT) |
commit | 46f1fa01dad3253fd7a748a765dc46b000ea67d4 (patch) | |
tree | 4f368401ce2c8e3c304c3d833073685812e5eccd /Source | |
parent | 1ec3fee12b205ded5e3afc74a47d47e0dc870b03 (diff) | |
parent | 7b0f6508a03d7045d7599068ce9409004df2dbb0 (diff) | |
download | CMake-46f1fa01dad3253fd7a748a765dc46b000ea67d4.zip CMake-46f1fa01dad3253fd7a748a765dc46b000ea67d4.tar.gz CMake-46f1fa01dad3253fd7a748a765dc46b000ea67d4.tar.bz2 |
Merge topic 'imported-local-target-alias' into release-3.18
7b0f6508a0 ALIAS targets: Non-global aliases must be propagated to sub-directories
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5002
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmMakefile.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c78b751..db5cee9 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1461,6 +1461,9 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent) // Imported targets. this->ImportedTargets = parent->ImportedTargets; + // Non-global Alias targets. + this->AliasTargets = parent->AliasTargets; + // Recursion depth. this->RecursionDepth = parent->RecursionDepth; } |