diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-23 13:19:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-02-23 13:22:51 (GMT) |
| commit | f6fc689c26dcc10408f3208f1399769da06ecfc2 (patch) | |
| tree | 49a6000e5ed3e087497f1dac84e530157b9c3281 /Source | |
| parent | c786164fe04480fef246aafd1e1c38d04a0f73fa (diff) | |
| parent | 481420ee89992cd8e761ce36808b3dc73ccc16d2 (diff) | |
| download | CMake-f6fc689c26dcc10408f3208f1399769da06ecfc2.zip CMake-f6fc689c26dcc10408f3208f1399769da06ecfc2.tar.gz CMake-f6fc689c26dcc10408f3208f1399769da06ecfc2.tar.bz2 | |
Merge topic '14297-partial-xcode-zero-check'
481420ee Xcode: Generate ZERO_CHECK generator target only once
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1790
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 2a38599..d3f5aac 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -459,7 +459,11 @@ void cmGlobalXCodeGenerator::AddExtraTargets( // Add ZERO_CHECK bool regenerate = !mf->IsOn("CMAKE_SUPPRESS_REGENERATION"); - if (regenerate) { + bool generateTopLevelProjectOnly = + mf->IsOn("CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY"); + bool isTopLevel = + !root->GetStateSnapshot().GetBuildsystemDirectoryParent().IsValid(); + if (regenerate && (isTopLevel || !generateTopLevelProjectOnly)) { this->CreateReRunCMakeFile(root, gens); std::string file = this->ConvertToRelativeForMake(this->CurrentReRunCMakeMakefile.c_str()); |