summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-10-31 15:34:58 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-10-31 15:34:58 (GMT)
commit163868b311158618184a98560ad8cffe3a1a9164 (patch)
tree297d60d67fc115f17577501744ccd822aba270e2 /Source
parentf274597abba00d4ae7947a9212e1db56ee801c4c (diff)
parent820e95d000911aae2ca0480ccb92e627f4ad0c48 (diff)
downloadCMake-163868b311158618184a98560ad8cffe3a1a9164.zip
CMake-163868b311158618184a98560ad8cffe3a1a9164.tar.gz
CMake-163868b311158618184a98560ad8cffe3a1a9164.tar.bz2
Merge topic 'xcode-inherit-warning-flags'
820e95d0 Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 13e6988..5e7a898 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2314,6 +2314,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
group->AddObject(this->CreateString("-Wmost"));
group->AddObject(this->CreateString("-Wno-four-char-constants"));
group->AddObject(this->CreateString("-Wno-unknown-pragmas"));
+ group->AddObject(this->CreateString("$(inherited)"));
buildSettings->AddAttribute("WARNING_CFLAGS", group);
}
else