From 0c7951a9397f4703d61d346c64c27a99a30f4dac Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 2 Jun 2016 09:47:29 -0400
Subject: cmLocalGenerator: Consolidate conditions in AddArchitectureFlags

Make room for possible future non-Apple architecture flags.
---
 Source/cmLocalGenerator.cxx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e91eb46..b748b9c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1475,11 +1475,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
                                             const std::string& config)
 {
   // Only add Mac OS X specific flags on Darwin platforms (OSX and iphone):
-  if (!this->Makefile->IsOn("APPLE")) {
-    return;
-  }
-
-  if (this->EmitUniversalBinaryFlags) {
+  if (this->Makefile->IsOn("APPLE") && this->EmitUniversalBinaryFlags) {
     std::vector<std::string> archs;
     target->GetAppleArchs(config, archs);
     const char* sysroot = this->Makefile->GetDefinition("CMAKE_OSX_SYSROOT");
-- 
cgit v0.12