[Cmake-commits] CMake branch, next, updated. v3.3.1-2319-g524481c

Gregor Jasny gjasny at googlemail.com
Fri Aug 21 14:00:27 EDT 2015


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  524481c809df3cb7b962af97ba1c9078dc5884c3 (commit)
       via  6819c083c3617d2a255c728fc0564306bdd15631 (commit)
      from  73b5206f39e5e85314184ddc7c1f84a9b3dd7999 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=524481c809df3cb7b962af97ba1c9078dc5884c3
commit 524481c809df3cb7b962af97ba1c9078dc5884c3
Merge: 73b5206 6819c08
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Aug 21 14:00:26 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 21 14:00:26 2015 -0400

    Merge topic 'ios-app-bundle-layout' into next
    
    6819c083 fixup! Fix iOS Bundle layouts (#15669)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6819c083c3617d2a255c728fc0564306bdd15631
commit 6819c083c3617d2a255c728fc0564306bdd15631
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Aug 21 19:59:08 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Fri Aug 21 19:59:08 2015 +0200

    fixup! Fix iOS Bundle layouts (#15669)

diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index fdb5f11..daf230a 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -5,7 +5,7 @@ enable_language(C)
 
 if(TEST_IOS)
   set(CMAKE_OSX_SYSROOT iphoneos)
-  #set(CMAKE_OSX_ARCHITECTURES "i386")
+  set(CMAKE_OSX_ARCHITECTURES "armv7")
   set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 endif(TEST_IOS)

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

Summary of changes:
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list