Merge pull request opencv#10241 from alalek:ios_fix_build_warnings

alalek · alalek · commit ef04ca9e0fdf · 2017-12-06T16:26:51.000Z
diff --git a/platforms/ios/build_framework.py b/platforms/ios/build_framework.py
@@ -278,7 +278,7 @@ def getCMakeArgs(self, arch, target):
 
     b = iOSBuilder(args.opencv, args.contrib, args.dynamic, args.bitcodedisabled, args.without,
         [
-            (["armv7", "arm64"], "iPhoneOS"),
+            (["armv7s", "arm64"], "iPhoneOS"),
         ] if os.environ.get('BUILD_PRECOMMIT', None) else
         [
             (["armv7", "armv7s", "arm64"], "iPhoneOS"),
diff --git a/platforms/ios/cmake/Modules/Platform/iOS.cmake b/platforms/ios/cmake/Modules/Platform/iOS.cmake
@@ -52,7 +52,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${no_warn}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fvisibility=hidden -fvisibility-inlines-hidden ${no_warn}")
 
 set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -ffast-math")
-if(NOT IOS_ARCH STREQUAL "armv7")
+if(NOT IOS_ARCH STREQUAL "armv7" AND NOT IOS_ARCH STREQUAL "armv7s")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer")
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ def getCMakeArgs(self, arch, target):`
`278`	`278`
`279`	`279`	`b = iOSBuilder(args.opencv, args.contrib, args.dynamic, args.bitcodedisabled, args.without,`
`280`	`280`	`[`
`281`		`- (["armv7", "arm64"], "iPhoneOS"),`
	`281`	`+ (["armv7s", "arm64"], "iPhoneOS"),`
`282`	`282`	`] if os.environ.get('BUILD_PRECOMMIT', None) else`
`283`	`283`	`[`
`284`	`284`	`(["armv7", "armv7s", "arm64"], "iPhoneOS"),`