diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fb77266..99ac7df5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1498,16 +1498,16 @@ IF(HAVE_ANDROID_LITE) PATTERN ".git" EXCLUDE PATTERN "bin" EXCLUDE ) - INSTALL( - DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR}/Solution/Android - DESTINATION Solution - COMPONENT emgutf_example_source - FILES_MATCHING - PATTERN "Emgu.TF.Lite.Example.Android.sln" - PATTERN ".git" EXCLUDE - PATTERN "bin" EXCLUDE - ) +# INSTALL( +# DIRECTORY +# ${CMAKE_CURRENT_SOURCE_DIR}/Solution/Android +# DESTINATION Solution +# COMPONENT emgutf_example_source +# FILES_MATCHING +# PATTERN "Emgu.TF.Lite.Android.sln" +# PATTERN ".git" EXCLUDE +# PATTERN "bin" EXCLUDE +# ) ENDIF() IF(HAVE_IOS_LITE) @@ -1515,9 +1515,9 @@ IF(HAVE_IOS_LITE) DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Solution/iOS DESTINATION Solution - COMPONENT emgutf_example_source + COMPONENT emgutf_source FILES_MATCHING - PATTERN "Emgu.TF.Lite.Example.iOS.sln" + PATTERN "Emgu.TF.Lite.iOS.sln" PATTERN ".git" EXCLUDE PATTERN "bin" EXCLUDE ) diff --git a/Emgu.TF.Runtime/Maui/Android/Full/CMakeLists.txt b/Emgu.TF.Runtime/Maui/Android/Full/CMakeLists.txt index 3eb48d05..67da9f95 100644 --- a/Emgu.TF.Runtime/Maui/Android/Full/CMakeLists.txt +++ b/Emgu.TF.Runtime/Maui/Android/Full/CMakeLists.txt @@ -9,7 +9,8 @@ IF(HAVE_ANDROID AND (WIN32 OR APPLE)) DESTINATION Emgu.TF.Runtime/Maui/Android COMPONENT emgutf_source FILES_MATCHING - PATTERN "*.cs" + PATTERN "*.cs" + PATTERN "Directory.Build.props" PATTERN "${PROJECT_NAME}.csproj" PATTERN ".svn" EXCLUDE PATTERN "obj" EXCLUDE diff --git a/Emgu.TF.Runtime/Maui/Android/Lite/CMakeLists.txt b/Emgu.TF.Runtime/Maui/Android/Lite/CMakeLists.txt index f88a37f8..3d1aa686 100644 --- a/Emgu.TF.Runtime/Maui/Android/Lite/CMakeLists.txt +++ b/Emgu.TF.Runtime/Maui/Android/Lite/CMakeLists.txt @@ -9,7 +9,8 @@ IF(HAVE_ANDROID_LITE AND (WIN32 OR APPLE)) DESTINATION Emgu.TF.Runtime/Maui/Android COMPONENT emgutf_source FILES_MATCHING - PATTERN "*.cs" + PATTERN "*.cs" + PATTERN "Directory.Build.props" PATTERN "${PROJECT_NAME}.csproj" PATTERN ".svn" EXCLUDE PATTERN "obj" EXCLUDE diff --git a/Emgu.TF.Runtime/Maui/iOS/CMakeLists.txt b/Emgu.TF.Runtime/Maui/iOS/CMakeLists.txt index 5055e66f..2b8297fe 100644 --- a/Emgu.TF.Runtime/Maui/iOS/CMakeLists.txt +++ b/Emgu.TF.Runtime/Maui/iOS/CMakeLists.txt @@ -10,7 +10,8 @@ IF(HAVE_IOS_LITE) COMPONENT emgutf_source FILES_MATCHING PATTERN "*.csproj" - PATTERN "*.cs" + PATTERN "Directory.Build.props" + PATTERN "*.cs" PATTERN ".svn" EXCLUDE PATTERN "obj" EXCLUDE PATTERN "CMakeFiles" EXCLUDE diff --git a/platforms/ios/bazel_build_tflite_ios b/platforms/ios/bazel_build_tflite_ios index b21871ef..7c97da76 100755 --- a/platforms/ios/bazel_build_tflite_ios +++ b/platforms/ios/bazel_build_tflite_ios @@ -12,7 +12,7 @@ if [ "$1" = "darwin_x86_64" ] || [ "$1" = "darwin_arm64" ]; then BAZEL_BUILD_OPTION="--apple_platform_type=macos --cpu=$1" else echo "Building for iOS" - BAZEL_BUILD_OPTION="-config=$1" + BAZEL_BUILD_OPTION="--config=$1" fi cd "$(dirname "$0")" diff --git a/platforms/ios/bazel_build_xcframework b/platforms/ios/bazel_build_xcframework index 3de8ebcb..6087d3c9 100755 --- a/platforms/ios/bazel_build_xcframework +++ b/platforms/ios/bazel_build_xcframework @@ -7,4 +7,5 @@ lipo -create -output ../../lib/ios/libtfliteextern_ios_simulator.a ../../lib/ios/libtfliteextern_ios_x86_64.a ../../lib/ios/libtfliteextern_ios_sim_arm64.a lipo -create -output ../../lib/ios/libtfliteextern.a ../../lib/ios/libtfliteextern_ios_x86_64.a ../../lib/ios/libtfliteextern_ios_arm64.a +rm -rf ../../lib/ios/libtfliteextern_ios.xcframework xcodebuild -create-xcframework -library ../../lib/ios/libtfliteextern_ios_simulator.a -library ../../lib/ios/libtfliteextern_ios_arm64.a -output ../../lib/ios/libtfliteextern_ios.xcframework