summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-05-15 17:02:09 (GMT)
committerBrad King <brad.king@kitware.com>2017-05-15 17:02:09 (GMT)
commitb8e707a6a1c5c486644132df01b7995740abfbd2 (patch)
tree6df145872ea27e1c198fe8482b581cdfbf231728
parent471779764757a3a6e4b5fb1db9b8943630b18f3d (diff)
downloadCMake-b8e707a6a1c5c486644132df01b7995740abfbd2.zip
CMake-b8e707a6a1c5c486644132df01b7995740abfbd2.tar.gz
CMake-b8e707a6a1c5c486644132df01b7995740abfbd2.tar.bz2
Xcode: Refactor internal decision for scheme generation
Move the Xcode version check out to wrap everything.
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index e2cb755..4e95fe7 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3279,10 +3279,11 @@ 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()->IsOn("CMAKE_XCODE_GENERATE_SCHEME")) {
+ this->OutputXCodeSharedSchemes(xcodeDir);
+ this->OutputXCodeWorkspaceSettings(xcodeDir);
+ }
}
this->ClearXCodeObjects();