diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-16 13:57:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-16 13:57:47 (GMT) |
| commit | e69e4448fb7e85c1148f145575c4748860d48520 (patch) | |
| tree | 000e5fddf0c15af8472c6751cfed6727ca695021 /Source | |
| parent | 8475734cb3050ac05ef040952d67d0c5bf59a4c5 (diff) | |
| parent | c608000a2a57faaac6e1789f8502e734db5ddb0e (diff) | |
| download | CMake-e69e4448fb7e85c1148f145575c4748860d48520.zip CMake-e69e4448fb7e85c1148f145575c4748860d48520.tar.gz CMake-e69e4448fb7e85c1148f145575c4748860d48520.tar.bz2 | |
Merge topic 'xcode-try_compile-scheme'
c608000a Xcode: Work around xcodebuild spurious hangs in try_compile
b8e707a6 Xcode: Refactor internal decision for scheme generation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !850
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e2cb755..84740ca 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3279,10 +3279,12 @@ void cmGlobalXCodeGenerator::OutputXCodeProject( // Since the lowest available Xcode version for testing was 7.0, // I'm setting this as a limit then - if (root->GetMakefile()->IsOn("CMAKE_XCODE_GENERATE_SCHEME") && - this->XcodeVersion >= 70) { - this->OutputXCodeSharedSchemes(xcodeDir); - this->OutputXCodeWorkspaceSettings(xcodeDir); + if (this->XcodeVersion >= 70) { + if (root->GetMakefile()->GetCMakeInstance()->GetIsInTryCompile() || + root->GetMakefile()->IsOn("CMAKE_XCODE_GENERATE_SCHEME")) { + this->OutputXCodeSharedSchemes(xcodeDir); + this->OutputXCodeWorkspaceSettings(xcodeDir); + } } this->ClearXCodeObjects(); |