summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-10-31 12:13:48 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-10-31 12:13:52 (GMT)
commit8c6fa52515a0d3ad9190f6f6cb9e00ce564a7012 (patch)
treed095e8d198cec2e7a3479262a6cc984ade147a0c
parent9c2e8cf8a2f9ca169b993d021f3f560e60702e76 (diff)
parent89add9b3e6a9d8aef4f63e3e03a8478480d66f11 (diff)
downloadCMake-8c6fa52515a0d3ad9190f6f6cb9e00ce564a7012.zip
CMake-8c6fa52515a0d3ad9190f6f6cb9e00ce564a7012.tar.gz
CMake-8c6fa52515a0d3ad9190f6f6cb9e00ce564a7012.tar.bz2
Merge topic '15468-xcode-hide-zero-check-source-group'
89add9b3 Xcode: Do not create ZERO_CHECK source group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1429
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 78943e4..97e461d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2288,7 +2288,8 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateUtilityTarget(
this->XCodeObjectMap[gtgt] = target;
// Add source files without build rules for editing convenience.
- if (gtgt->GetType() == cmStateEnums::UTILITY) {
+ if (gtgt->GetType() == cmStateEnums::UTILITY &&
+ gtgt->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET) {
std::vector<cmSourceFile*> sources;
if (!gtgt->GetConfigCommonSourceFiles(sources)) {
return nullptr;
@@ -2705,7 +2706,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(
generator->GetGeneratorTargets();
for (auto gtgt : tgts) {
// Same skipping logic here as in CreateXCodeTargets so that we do not
- // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
+ // end up with (empty anyhow) ZERO_CHECK, install, or test source
// groups:
//
if (gtgt->GetType() == cmStateEnums::GLOBAL_TARGET) {
@@ -2714,6 +2715,9 @@ bool cmGlobalXCodeGenerator::CreateGroups(
if (gtgt->GetType() == cmStateEnums::INTERFACE_LIBRARY) {
continue;
}
+ if (gtgt->GetName() == CMAKE_CHECK_BUILD_SYSTEM_TARGET) {
+ continue;
+ }
// add the soon to be generated Info.plist file as a source for a
// MACOSX_BUNDLE file