diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-13 11:45:54 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-13 07:46:09 -0400 |
| commit | f5be951117711a3965db0f9cd59a2913efacece7 (patch) | |
| tree | 0fa922865dcd8eb881af99c4ce50c03f3cc8a399 /Source/cmMakefile.cxx | |
| parent | 37915a69304d0de36e15b024380a7ddabeb0d821 (diff) | |
| parent | 376dc3eb2218c64db50ae53c04376dfb42c538ba (diff) | |
| download | cmake-f5be951117711a3965db0f9cd59a2913efacece7.tar.gz | |
Merge topic 'labels-for-subprojects'
376dc3eb Help: Add notes for topic 'labels_for_subprojects'
a70d8e93 Add tests for new directory labels and labels-for-subprojects features
47b3a57c Display subproject timing summary
d3859624 Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable
d08ec4d2 Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1004
Diffstat (limited to 'Source/cmMakefile.cxx')
| -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 fb956bcab7..f077459cf1 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1235,6 +1235,9 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent) } } + // labels + this->SetProperty("LABELS", parent->GetProperty("LABELS")); + // link libraries this->SetProperty("LINK_LIBRARIES", parent->GetProperty("LINK_LIBRARIES")); |