From b8e707a6a1c5c486644132df01b7995740abfbd2 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 15 May 2017 13:02:09 -0400
Subject: Xcode: Refactor internal decision for scheme generation

Move the Xcode version check out to wrap everything.
---
 Source/cmGlobalXCodeGenerator.cxx | 9 +++++----
 1 file 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();
-- 
cgit v0.12