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 c12be0dce8d045b3759296f5ce0607e80820f27d (commit) via d4ab0ebf35edd9fa74ce915f6f0b23e006217fe3 (commit) from c660fc32242906a361ca99c513465278bcc0fe97 (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=c12be0dce8d045b3759296f5ce0607e80820f27d commit c12be0dce8d045b3759296f5ce0607e80820f27d Merge: c660fc3 d4ab0eb Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sat Aug 22 04:31:18 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Aug 22 04:31:18 2015 -0400 Merge topic 'ios-app-bundle-layout' into next d4ab0ebf fixup! fixup! Fix iOS Bundle layouts (#15669) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4ab0ebf35edd9fa74ce915f6f0b23e006217fe3 commit d4ab0ebf35edd9fa74ce915f6f0b23e006217fe3 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sat Aug 22 10:30:39 2015 +0200 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Sat Aug 22 10:30:39 2015 +0200 fixup! fixup! Fix iOS Bundle layouts (#15669) diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake index daf230a..d5cb51f 100644 --- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake @@ -8,6 +8,7 @@ if(TEST_IOS) set(CMAKE_OSX_ARCHITECTURES "armv7") set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator") set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") + set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") endif(TEST_IOS) # App Bundle @@ -20,16 +21,18 @@ add_custom_target(AppBundleTest ALL add_dependencies(AppBundleTest AppBundle) -# Framework +# Framework (not supported for iOS on Xcode < 6) -add_library(Framework SHARED main.c) -set_target_properties(Framework PROPERTIES FRAMEWORK TRUE) +if(NOT TEST_IOS OR NOT XCODE_VERSION VERSION_LESS 6) + add_library(Framework SHARED main.c) + set_target_properties(Framework PROPERTIES FRAMEWORK TRUE) -add_custom_target(FrameworkTest ALL - COMMAND ${CMAKE_COMMAND} -E copy - "$<TARGET_FILE:Framework>" "$<TARGET_FILE:Framework>.old") + add_custom_target(FrameworkTest ALL + COMMAND ${CMAKE_COMMAND} -E copy + "$<TARGET_FILE:Framework>" "$<TARGET_FILE:Framework>.old") -add_dependencies(FrameworkTest Framework) + add_dependencies(FrameworkTest Framework) +endif() # Bundle ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/XcodeProject/XcodeBundles.cmake | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits