Browse Source

Target iOS 11.0 (instead of 9.0), Catalyst 13.2 (instead of 11.0)

pull/768/head
Canming Huang 3 years ago
parent
commit
9d49d5f545
  1. 4
      CMakeLists.txt
  2. 20
      platforms/ios/build.sh
  3. 6
      platforms/ios/configure_xcode.sh

4
CMakeLists.txt

@ -1127,7 +1127,7 @@ IF(HAVE_ANDROID_ALL_ARCH)
SET(EMGUCV_MAUI_ANDROID_NUGET_ID "${EMGUCV_NUGET_ID}.runtime.maui${EMGUCV_RUNTIME_EXTRA_TAG}.android")
ENDIF()
IF(HAVE_IOS AND WIN32)
IF(HAVE_IOS)
SET(EMGUCV_XAMARIN_IOS_NUGET_ID "${EMGUCV_NUGET_ID}.runtime.xamarin${EMGUCV_RUNTIME_EXTRA_TAG}.ios")
SET(EMGUCV_MAUI_IOS_NUGET_ID "${EMGUCV_NUGET_ID}.runtime.maui${EMGUCV_RUNTIME_EXTRA_TAG}.ios")
ENDIF()
@ -1785,7 +1785,7 @@ IF(HAVE_ANDROID_ALL_ARCH)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.runtime.maui.android.Package.README.md.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Platform/Maui/Android/docs/README.md)
ENDIF()
IF(HAVE_IOS AND WIN32)
IF(HAVE_IOS)
SET(EMGUCV_XAMARIN_IOS_NUGET_TITLE "Emgu CV for Xamarin iOS Native Runtime")
SET(EMGUCV_XAMARIN_IOS_NUGET_FILE_LIST "
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.Xamarin.IOS.dll\" target=\"lib\\Xamarin.iOS10\" />

20
platforms/ios/build.sh

@ -26,17 +26,17 @@ fi
JOB_COUNT=1
if [ \( "$1" != "simulator_arm64" \) -a \( "$1" != "simulator_x86_64" \) ]; then
mkdir -p platforms/ios/iphoneos_armv7s
cd platforms/ios/iphoneos_armv7s
../configure_xcode.sh $CV_CONTRIB_OPTION device armv7s ${@:3}
./xcodebuild_wrapper -parallelizeTargets -jobs ${JOB_COUNT} -configuration Release -target ALL_BUILD build
cd ../../..
# mkdir -p platforms/ios/iphoneos_armv7s
# cd platforms/ios/iphoneos_armv7s
# ../configure_xcode.sh $CV_CONTRIB_OPTION device armv7s ${@:3}
# ./xcodebuild_wrapper -parallelizeTargets -jobs ${JOB_COUNT} -configuration Release -target ALL_BUILD build
# cd ../../..
mkdir -p platforms/ios/iphoneos_armv7
cd platforms/ios/iphoneos_armv7
../configure_xcode.sh $CV_CONTRIB_OPTION device armv7 ${@:3}
./xcodebuild_wrapper -parallelizeTargets -jobs ${JOB_COUNT} -configuration Release -target ALL_BUILD build
cd ../../..
# mkdir -p platforms/ios/iphoneos_armv7
# cd platforms/ios/iphoneos_armv7
# ../configure_xcode.sh $CV_CONTRIB_OPTION device armv7 ${@:3}
# ./xcodebuild_wrapper -parallelizeTargets -jobs ${JOB_COUNT} -configuration Release -target ALL_BUILD build
# cd ../../..
mkdir -p platforms/ios/iphoneos_arm64
cd platforms/ios/iphoneos_arm64

6
platforms/ios/configure_xcode.sh

@ -19,15 +19,15 @@ INSTALL_FOLDER=$PWD/build/install
if [ "$2" == "device" ]; then
CV_TOOLCHAIN_OPTION=( -DCMAKE_TOOLCHAIN_FILE=$CURRENT_SCRIPT_DIR/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake )
INSTALL_FOLDER=$INSTALL_FOLDER/OpenCV_iPhoneOS_$3
CMAKE_COMMON_OPTION=( -DIPHONEOS_DEPLOYMENT_TARGET:STRING=9.0 )
CMAKE_COMMON_OPTION=( -DIPHONEOS_DEPLOYMENT_TARGET:STRING=11.0 )
elif [ "$2" == "catalyst" ]; then
CV_TOOLCHAIN_OPTION=( -DAPPLE_FRAME_WORK:BOOL=TRUE -DCMAKE_TOOLCHAIN_FILE=$CURRENT_SCRIPT_DIR/cmake/Toolchains/Toolchain-Catalyst_Xcode.cmake )
INSTALL_FOLDER=$INSTALL_FOLDER/OpenCV_catalyst_$3
CMAKE_COMMON_OPTION=( -DIPHONEOS_DEPLOYMENT_TARGET:STRING=11.0 )
CMAKE_COMMON_OPTION=( -DIPHONEOS_DEPLOYMENT_TARGET:STRING=13.2 )
else
CV_TOOLCHAIN_OPTION=( -DCMAKE_TOOLCHAIN_FILE=$CURRENT_SCRIPT_DIR/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake )
INSTALL_FOLDER=$INSTALL_FOLDER/OpenCV_iPhoneSimulator_$3
CMAKE_COMMON_OPTION=( -DIPHONEOS_DEPLOYMENT_TARGET:STRING=9.0 )
CMAKE_COMMON_OPTION=( -DIPHONEOS_DEPLOYMENT_TARGET:STRING=11.0 )
fi
INSTALL_PREFIX_OPTION=( -DCMAKE_INSTALL_PREFIX=$INSTALL_FOLDER )

Loading…
Cancel
Save