build: fix iOS warnings with armv7s, switch precommit armv7 -> armv7s

diff --git a/platforms/ios/build_framework.py b/platforms/ios/build_framework.py
index 78d9ec6..7428ddc 100644 (file)
--- a/platforms/ios/build_framework.py
+++ b/platforms/ios/build_framework.py
@@ -278,7 +278,7 @@ if __name__ == "__main__":
 
     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
index 710d5e4..5e2bbc5 100644 (file)
--- 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()