Merge pull request #247 from rainyl/ios-framework-minimumos

fix: [iOS] opencv_dart framework is missing MinimumOSVersion #246
rainyl · Sep 21, 2024 · 6384668 · 6384668
2 parents cbfcc9e + 34071a4
commit 6384668
Show file tree

Hide file tree

Showing 3 changed files with 158 additions and 112 deletions.
diff --git a/.github/workflows/apple.yaml b/.github/workflows/apple.yaml
@@ -8,7 +8,7 @@ on:
     branches: [ "main" ]
 
 env:
-  IOS_DEPLOYMENT_TARGET: '13.0'
+  IOS_DEPLOYMENT_TARGET: '11.0'
   MAC_DEPLOYMENT_TARGET: '11.0'
   ENABLE_BITCODE: OFF
   ENABLE_ARC: OFF

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.15)
 project(opencv_dart_library VERSION 1.0.0 LANGUAGES C CXX)
 set(LIBRARY_NAME "opencv_dart")
 
+file(READ ${CMAKE_SOURCE_DIR}/binary.version PROJECT_VERSION)
+
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
@@ -11,90 +13,101 @@ cmake_policy(SET CMP0135 NEW)
 set(OpenCV_STATIC ON)
 
 if(LINUX OR APPLE)
-    find_package(Iconv REQUIRED)
+  find_package(Iconv REQUIRED)
 endif()
 find_package(OpenCV REQUIRED)
 
 set(OpenCV_LIBS
-    opencv_aruco opencv_core opencv_calib3d opencv_dnn opencv_highgui
-    opencv_features2d opencv_gapi opencv_photo opencv_imgproc
-    opencv_objdetect opencv_video opencv_videoio opencv_stitching
-    opencv_img_hash opencv_wechat_qrcode opencv_ximgproc opencv_xobjdetect
-    opencv_quality
+  opencv_aruco opencv_core opencv_calib3d opencv_dnn opencv_highgui
+  opencv_features2d opencv_gapi opencv_photo opencv_imgproc
+  opencv_objdetect opencv_video opencv_videoio opencv_stitching
+  opencv_img_hash opencv_wechat_qrcode opencv_ximgproc opencv_xobjdetect
+  opencv_quality
 )
 
 if(ANDROID)
-    list(APPEND OpenCV_LIBS camera2ndk mediandk -landroid)
+  list(APPEND OpenCV_LIBS camera2ndk mediandk -landroid)
 endif(ANDROID)
 
 if(IOS)
-    list(APPEND OpenCV_LIBS
-        "-framework CoreFoundation"
-        "-framework CoreImage"
-        "-framework Foundation"
-    )
+  list(APPEND OpenCV_LIBS
+    "-framework CoreFoundation"
+    "-framework CoreImage"
+    "-framework Foundation"
+  )
 endif(IOS)
 
 message(STATUS "OpenCV library status:")
 message(STATUS "    config: ${OpenCV_DIR}")
 message(STATUS "    version: ${OpenCV_VERSION}")
 message(STATUS "    libraries: ${OpenCV_LIBS}")
 message(STATUS "    include path: ${OpenCV_INCLUDE_DIRS}")
+message(STATUS "Project version: ${PROJECT_VERSION}")
 
 file(GLOB_RECURSE CPP_FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/**/*.cpp"
-
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/calib3d/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/core/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/dnn/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/extra/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/highgui/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/imgcodecs/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/imgproc/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/objdetect/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/photo/*.cpp"
-    # "${CMAKE_CURRENT_SOURCE_DIR}/src/stitching/*.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/**/*.cpp"
+
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/calib3d/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/core/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/dnn/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/extra/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/highgui/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/imgcodecs/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/imgproc/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/objdetect/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/photo/*.cpp"
+  # "${CMAKE_CURRENT_SOURCE_DIR}/src/stitching/*.cpp"
 )
 file(GLOB_RECURSE HEADER_FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/**/*.h"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/**/*.h"
 )
 
 add_library(${LIBRARY_NAME} SHARED
-    ${CPP_FILES}
+  ${CPP_FILES}
 )
 target_include_directories(${LIBRARY_NAME} SYSTEM PUBLIC
-    "${CMAKE_CURRENT_SOURCE_DIR}/src"
-    ${OpenCV_INCLUDE_DIRS}
+  "${CMAKE_CURRENT_SOURCE_DIR}/src"
+  ${OpenCV_INCLUDE_DIRS}
 )
 target_link_libraries(${LIBRARY_NAME} PRIVATE ${OpenCV_LIBS})
 
 set_target_properties(${LIBRARY_NAME} PROPERTIES
-    # PUBLIC_HEADER ${HEADER_FILES}
-    OUTPUT_NAME ${LIBRARY_NAME}
-    CXX_VISIBILITY_PRESET default
-    C_VISIBILITY_PRESET default
-    LINK_FLAGS_RELEASE -s
+  # PUBLIC_HEADER ${HEADER_FILES}
+  OUTPUT_NAME ${LIBRARY_NAME}
+  CXX_VISIBILITY_PRESET default
+  C_VISIBILITY_PRESET default
+  LINK_FLAGS_RELEASE -s
 )
 
 if(IOS)
-    set_target_properties(${LIBRARY_NAME} PROPERTIES
-        FRAMEWORK TRUE
-        FRAMEWORK_VERSION CXX
-        MACOSX_FRAMEWORK_IDENTIFIER dev.rainyl.opencvDart
-        MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
-        MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION}
-    )
+  # PLATFORM will be defined using ios.toolchain.cmake
+  if(DEFINED PLATFORM)
+    if(PLATFORM STREQUAL "SIMULATOR64")
+      set(IOS_SUPPORTED_PLATFORM "iPhoneSimulator")
+    elseif(PLATFORM STREQUAL "OS64")
+      set(IOS_SUPPORTED_PLATFORM "iPhoneOS")
+    else()
+      message(FATAL_ERROR "For IOS, only OS64 and SIMULATOR64 are supported now.")
+    endif()
+  else()
+    message(FATAL_ERROR "For IOS, you must define PLATFORM")
+  endif()
+  set_target_properties(${LIBRARY_NAME} PROPERTIES
+    FRAMEWORK TRUE
+    FRAMEWORK_VERSION CXX
+    MACOSX_FRAMEWORK_INFO_PLIST ${CMAKE_SOURCE_DIR}/ios/Info.plist.in
+  )
 endif(IOS)
 
 if(APPLE)
-    target_link_options(${LIBRARY_NAME} PRIVATE "LINKER:-ld_classic")
+  target_link_options(${LIBRARY_NAME} PRIVATE "LINKER:-ld_classic")
 endif(APPLE)
 
 if(WIN32)
-    set_target_properties(${LIBRARY_NAME} PROPERTIES
-        WINDOWS_EXPORT_ALL_SYMBOLS ON
-        COMPILE_FLAGS "/EHsc"
-    )
+  set_target_properties(${LIBRARY_NAME} PROPERTIES
+    WINDOWS_EXPORT_ALL_SYMBOLS ON
+    COMPILE_FLAGS "/EHsc"
+  )
 endif(WIN32)
 
 target_compile_definitions(${LIBRARY_NAME} PUBLIC DART_SHARED_LIB)
@@ -105,13 +118,13 @@ endif()
 
 ### install
 if(WIN32)
-    file(GLOB_RECURSE FFMPEG_DLL "${OpenCV_DIR}/**/*ffmpeg*.dll")
-    file(TO_CMAKE_PATH ${FFMPEG_DLL} FFMPEG_DLL)
-    file(GLOB CV_DEPENDENCIES "${CMAKE_BINARY_DIR}/*.dll" ${FFMPEG_DLL})
+  file(GLOB_RECURSE FFMPEG_DLL "${OpenCV_DIR}/**/*ffmpeg*.dll")
+  file(TO_CMAKE_PATH ${FFMPEG_DLL} FFMPEG_DLL)
+  file(GLOB CV_DEPENDENCIES "${CMAKE_BINARY_DIR}/*.dll" ${FFMPEG_DLL})
 elseif(APPLE)
-    file(GLOB CV_DEPENDENCIES "${CMAKE_BINARY_DIR}/*.dylib")
+  file(GLOB CV_DEPENDENCIES "${CMAKE_BINARY_DIR}/*.dylib")
 elseif(LINUX)
-    file(GLOB CV_DEPENDENCIES "${CMAKE_BINARY_DIR}/*.so")
+  file(GLOB CV_DEPENDENCIES "${CMAKE_BINARY_DIR}/*.so")
 endif()
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX})
@@ -124,68 +137,68 @@ if(CVD_PLATFORM_INSTALL_DIR)
 endif()
 
 if(CVD_ENABLE_TEST)
-    ### test
-    include(FetchContent)
-    FetchContent_Declare(
-        googletest
-        URL https://github.com/google/googletest/archive/refs/heads/main.zip
-    )
-    # For Windows: Prevent overriding the parent project's compiler/linker settings
-    if(WIN32)
-        set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-    endif(WIN32)
-    FetchContent_MakeAvailable(googletest)
-    # copy test images
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/test)
+  ### test
+  include(FetchContent)
+  FetchContent_Declare(
+    googletest
+    URL https://github.com/google/googletest/archive/refs/heads/main.zip
+  )
+  # For Windows: Prevent overriding the parent project's compiler/linker settings
+  if(WIN32)
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+  endif(WIN32)
+  FetchContent_MakeAvailable(googletest)
+  # copy test images
+  file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/test)
+  file(COPY
+    "${CMAKE_CURRENT_SOURCE_DIR}/test/images"
+    DESTINATION ${CMAKE_BINARY_DIR}/test
+  )
+  # model files for DNN test
+  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/models")
     file(COPY
-        "${CMAKE_CURRENT_SOURCE_DIR}/test/images"
-        DESTINATION ${CMAKE_BINARY_DIR}/test
+      "${CMAKE_CURRENT_SOURCE_DIR}/test/models"
+      DESTINATION ${CMAKE_BINARY_DIR}/test
     )
-    # model files for DNN test
-    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/models")
-        file(COPY
-        "${CMAKE_CURRENT_SOURCE_DIR}/test/models"
-        DESTINATION ${CMAKE_BINARY_DIR}/test
-        )
-    endif()
+  endif()
+
+  enable_testing()
 
-    enable_testing()
-
-    macro(add_ocv_dart_test executable_name source_file)
-        add_executable(
-            ${executable_name}
-            "${source_file}"
-        )
-
-        target_link_libraries(
-            ${executable_name}
-            PUBLIC
-            ${OpenCV_LIBS}
-            ${LIBRARY_NAME}
-            GTest::gtest_main
-        )
-
-        if(WIN32)
-            set_target_properties(${executable_name} PROPERTIES
-                COMPILE_FLAGS "/EHsc"
-            )
-        endif(WIN32)
-    endmacro()
-
-    add_ocv_dart_test(ocv_dart_test_vec "src/test/vec.cc")
-    add_ocv_dart_test(ocv_dart_test_core "src/test/core.cc")
-    add_ocv_dart_test(ocv_dart_test_calib3d "src/test/calib3d.cc")
-    add_ocv_dart_test(ocv_dart_test_dnn "src/test/dnn.cc")
-    add_ocv_dart_test(ocv_dart_test_imgcodecs "src/test/imgcodecs.cc")
-    add_ocv_dart_test(ocv_dart_test_imgproc "src/test/imgproc.cc")
-    add_ocv_dart_test(ocv_dart_test_video "src/test/video.cc")
-
-    include(GoogleTest)
-    gtest_discover_tests(ocv_dart_test_vec)
-    gtest_discover_tests(ocv_dart_test_core)
-    gtest_discover_tests(ocv_dart_test_calib3d)
-    gtest_discover_tests(ocv_dart_test_dnn)
-    gtest_discover_tests(ocv_dart_test_imgcodecs)
-    gtest_discover_tests(ocv_dart_test_imgproc)
-    gtest_discover_tests(ocv_dart_test_video)
+  macro(add_ocv_dart_test executable_name source_file)
+    add_executable(
+      ${executable_name}
+      "${source_file}"
+    )
+
+    target_link_libraries(
+      ${executable_name}
+      PUBLIC
+      ${OpenCV_LIBS}
+      ${LIBRARY_NAME}
+      GTest::gtest_main
+    )
+
+    if(WIN32)
+      set_target_properties(${executable_name} PROPERTIES
+        COMPILE_FLAGS "/EHsc"
+      )
+    endif(WIN32)
+  endmacro()
+
+  add_ocv_dart_test(ocv_dart_test_vec "src/test/vec.cc")
+  add_ocv_dart_test(ocv_dart_test_core "src/test/core.cc")
+  add_ocv_dart_test(ocv_dart_test_calib3d "src/test/calib3d.cc")
+  add_ocv_dart_test(ocv_dart_test_dnn "src/test/dnn.cc")
+  add_ocv_dart_test(ocv_dart_test_imgcodecs "src/test/imgcodecs.cc")
+  add_ocv_dart_test(ocv_dart_test_imgproc "src/test/imgproc.cc")
+  add_ocv_dart_test(ocv_dart_test_video "src/test/video.cc")
+
+  include(GoogleTest)
+  gtest_discover_tests(ocv_dart_test_vec)
+  gtest_discover_tests(ocv_dart_test_core)
+  gtest_discover_tests(ocv_dart_test_calib3d)
+  gtest_discover_tests(ocv_dart_test_dnn)
+  gtest_discover_tests(ocv_dart_test_imgcodecs)
+  gtest_discover_tests(ocv_dart_test_imgproc)
+  gtest_discover_tests(ocv_dart_test_video)
 endif()
diff --git a/ios/Info.plist.in b/ios/Info.plist.in
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>${LIBRARY_NAME}</string>
+    <key>CFBundleName</key>
+    <string>${LIBRARY_NAME}</string>
+    <key>CFBundleIdentifier</key>
+    <string>dev.rainyl.OpenCvDart</string>
+    <key>CFBundleVersion</key>
+    <string>${PROJECT_VERSION}</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${PROJECT_VERSION}</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
+    <key>CFBundleSupportedPlatforms</key>
+    <array>
+        <string>${IOS_SUPPORTED_PLATFORM}</string>
+    </array>
+    <key>MinimumOSVersion</key>
+    <string>100.0</string>
+    <key>UIDeviceFamily</key>
+    <array>
+        <integer>1</integer>
+        <integer>2</integer>
+    </array>
+</dict>
+</plist>