summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-07-13 11:52:45 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-07-13 11:53:01 (GMT)
commit7160a2b9d9b20e2e264709a0ffa561f890b3f275 (patch)
treef943617798c2043b94514078bd02ae57f784f2b1 /Source/cmMakefile.cxx
parentb71d2b1955ece1d9289f1111e3930064f22cf962 (diff)
parent7b0f6508a03d7045d7599068ce9409004df2dbb0 (diff)
downloadCMake-7160a2b9d9b20e2e264709a0ffa561f890b3f275.zip
CMake-7160a2b9d9b20e2e264709a0ffa561f890b3f275.tar.gz
CMake-7160a2b9d9b20e2e264709a0ffa561f890b3f275.tar.bz2
Merge topic 'imported-local-target-alias'
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/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4b595a6..75c8934 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1462,6 +1462,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;
}