Try to add FastCV to OpenCV4AndroidSDK

asmorkalov · asmorkalov · commit 99e375863412 · 2025-05-24T09:12:36.000+03:00
diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
@@ -204,6 +204,7 @@ if(WITH_FASTCV)
       )
       if (NOT BUILD_SHARED_LIBS)
         install(FILES "${FastCV_LIB_PATH}/libfastcv.a" DESTINATION "${OPENCV_3P_LIB_INSTALL_PATH}" COMPONENT "dev")
+        set(FASTCV_LOCATION_PATH "${FastCV_LIB_PATH}/libfastcv.a" CACHE INTERNAL "" FORCE)
       endif()
       set(FASTCV_LIBRARY "fastcv" CACHE PATH "FastCV library")
       list(APPEND OPENCV_LINKER_LIBS ${FASTCV_LIBRARY})
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
@@ -68,6 +68,11 @@ else()
   set(USE_IPPIW FALSE)
 endif()
 
+if(TARGET fastcv AND NOT BUILD_SHARED_LIBS)
+  file(RELATIVE_PATH FASTCV_INSTALL_PATH_RELATIVE_CONFIGCMAKE "${CMAKE_BINARY_DIR}" "${FASTCV_LOCATION_PATH}")
+  ocv_cmake_configure("${CMAKE_CURRENT_LIST_DIR}/templates/OpenCVConfig-FastCV.cmake.in" FASTCV_CONFIGCMAKE @ONLY)
+endif()
+
 ocv_cmake_hook(PRE_CMAKE_CONFIG_BUILD)
 configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" @ONLY)
 #support for version checking when finding opencv. find_package(OpenCV 2.3.1 EXACT) should now work.
diff --git a/cmake/templates/OpenCVConfig-FastCV.cmake.in b/cmake/templates/OpenCVConfig-FastCV.cmake.in
@@ -0,0 +1,7 @@
+if(NOT TARGET fastcv)
+  add_library(fastcv STATIC IMPORTED)
+  set_target_properties(fastcv PROPERTIES
+    IMPORTED_LINK_INTERFACE_LIBRARIES ""
+    IMPORTED_LOCATION "${OpenCV_INSTALL_PATH}/@FASTCV_INSTALL_PATH_RELATIVE_CONFIGCMAKE@"
+  )
+endif()
diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in
@@ -99,6 +99,8 @@ endif()
 @IPPICV_CONFIGCMAKE@
 @IPPIW_CONFIGCMAKE@
 
+@FASTCV_CONFIGCMAKE@
+
 # Some additional settings are required if OpenCV is built as static libs
 set(OpenCV_SHARED @BUILD_SHARED_LIBS@)
 
diff --git a/platforms/android/default.config.py b/platforms/android/default.config.py
@@ -1,6 +1,6 @@
 ABIs = [
-    ABI("2", "armeabi-v7a", None, 21, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON')),
-    ABI("3", "arm64-v8a",   None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')),
+    ABI("2", "armeabi-v7a", None, 21, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON', WITH_FASTCV='ON')),
+    ABI("3", "arm64-v8a",   None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON', WITH_FASTCV='ON')),
     ABI("5", "x86_64",      None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')),
     ABI("4", "x86",         None, 21, cmake_vars=dict(WITH_IPP='OFF')),
 ]

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@ if(WITH_FASTCV)`
`204`	`204`	`)`
`205`	`205`	`if (NOT BUILD_SHARED_LIBS)`
`206`	`206`	`install(FILES "${FastCV_LIB_PATH}/libfastcv.a" DESTINATION "${OPENCV_3P_LIB_INSTALL_PATH}" COMPONENT "dev")`
	`207`	`+ set(FASTCV_LOCATION_PATH "${FastCV_LIB_PATH}/libfastcv.a" CACHE INTERNAL "" FORCE)`
`207`	`208`	`endif()`
`208`	`209`	`set(FASTCV_LIBRARY "fastcv" CACHE PATH "FastCV library")`
`209`	`210`	`list(APPEND OPENCV_LINKER_LIBS ${FASTCV_LIBRARY})`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`ABIs = [`
`2`		`- ABI("2", "armeabi-v7a", None, 21, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON')),`
`3`		`- ABI("3", "arm64-v8a", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')),`
	`2`	`+ ABI("2", "armeabi-v7a", None, 21, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON', WITH_FASTCV='ON')),`
	`3`	`+ ABI("3", "arm64-v8a", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON', WITH_FASTCV='ON')),`
`4`	`4`	`ABI("5", "x86_64", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')),`
`5`	`5`	`ABI("4", "x86", None, 21, cmake_vars=dict(WITH_IPP='OFF')),`
`6`	`6`	`]`