[Cmake-commits] CMake branch, next, updated. v3.5.2-835-gf84fce7

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f84fce7f22efd0066fef03ccc91a9bdb71ed71ea (commit)
       via  0c7951a9397f4703d61d346c64c27a99a30f4dac (commit)
      from  49849d2584448a6a2eaa34327a51b25140c1ebce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f84fce7f22efd0066fef03ccc91a9bdb71ed71ea
commit f84fce7f22efd0066fef03ccc91a9bdb71ed71ea
Merge: 49849d2 0c7951a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 2 09:49:41 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 2 09:49:41 2016 -0400

    Merge topic 'minor-cleanups' into next
    
    0c7951a9 cmLocalGenerator: Consolidate conditions in AddArchitectureFlags


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c7951a9397f4703d61d346c64c27a99a30f4dac
commit 0c7951a9397f4703d61d346c64c27a99a30f4dac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 2 09:47:29 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 2 09:47:32 2016 -0400

    cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
    
    Make room for possible future non-Apple architecture flags.

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");

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalGenerator.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)


hooks/post-receive
-- 
CMake