summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBetsy McPhail <betsy.mcphail@kitware.com>2017-06-23 16:12:00 (GMT)
committerBrad King <brad.king@kitware.com>2017-07-10 20:25:18 (GMT)
commitd385962419ea3109dd21093c2368379f5fb51722 (patch)
tree8c6a4fa9ff3383309844abeb8038a83baf701857 /Source/cmMakefile.cxx
parentd08ec4d25a8113388092bf342002f3859f6b8de4 (diff)
downloadCMake-d385962419ea3109dd21093c2368379f5fb51722.zip
CMake-d385962419ea3109dd21093c2368379f5fb51722.tar.gz
CMake-d385962419ea3109dd21093c2368379f5fb51722.tar.bz2
Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable
The specified LABELS will be passed down to subdirectories as well as any targets or tests in the directory.
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 4a0cab3..8da1e44 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1237,6 +1237,9 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
}
}
+ // labels
+ this->SetProperty("LABELS", parent->GetProperty("LABELS"));
+
// link libraries
this->SetProperty("LINK_LIBRARIES", parent->GetProperty("LINK_LIBRARIES"));