diff --git a/adapters/opencv/CMakeLists.txt b/adapters/opencv/CMakeLists.txt index d6f9e4b91755aba866d2730fec936236e1ce3edd..7ee1ff39db78089f2d643a3186c2980427526a74 100644 --- a/adapters/opencv/CMakeLists.txt +++ b/adapters/opencv/CMakeLists.txt @@ -16,8 +16,8 @@ target_link_libraries(intrinsiccv_hal PUBLIC intrinsiccv) target_include_directories(intrinsiccv_hal PRIVATE $ ${CMAKE_CURRENT_LIST_DIR} - ${CMAKE_SOURCE_DIR}/modules/core/include - ${CMAKE_SOURCE_DIR}/modules/imgproc/include + ${OPENCV_SOURCE_DIR}/modules/core/include + ${OPENCV_SOURCE_DIR}/modules/imgproc/include ) target_compile_options(intrinsiccv_hal PRIVATE $) set_target_properties(intrinsiccv_hal PROPERTIES CXX_STANDARD 17) diff --git a/adapters/opencv/opencv-4.9.patch b/adapters/opencv/opencv-4.9.patch index 0fd607db02ebf91a961cedce730f69f2c022f2f0..85eecfc63ae923ac1944158cd6246b77e3ad049f 100644 --- a/adapters/opencv/opencv-4.9.patch +++ b/adapters/opencv/opencv-4.9.patch @@ -12,10 +12,19 @@ index 0000000000..c0ffb73ad7 + +include("${INTRINSICCV_SOURCE_PATH}/adapters/opencv/CMakeLists.txt") diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5da9c2a695..0ec03b84b7 100644 +index 5da9c2a695..3f1a2c7e38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -254,6 +254,8 @@ OCV_OPTION(WITH_CAP_IOS "Enable iOS video capture" ON +@@ -13,6 +13,8 @@ FATAL: In-source builds are not allowed. + ") + endif() + ++# Useful for HALs if built as a CMake submodule ++set(OPENCV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + + include(cmake/OpenCVMinDepVersions.cmake) + +@@ -254,6 +256,8 @@ OCV_OPTION(WITH_CAP_IOS "Enable iOS video capture" ON VERIFY HAVE_CAP_IOS) OCV_OPTION(WITH_CAROTENE "Use NVidia carotene acceleration library for ARM platform" (NOT CV_DISABLE_OPTIMIZATION) VISIBLE_IF (ARM OR AARCH64) AND NOT IOS AND NOT XROS) @@ -24,7 +33,7 @@ index 5da9c2a695..0ec03b84b7 100644 OCV_OPTION(WITH_CPUFEATURES "Use cpufeatures Android library" ON VISIBLE_IF ANDROID VERIFY HAVE_CPUFEATURES) -@@ -955,6 +957,13 @@ if(HAVE_OPENVX) +@@ -955,6 +959,13 @@ if(HAVE_OPENVX) endif() endif() @@ -38,7 +47,7 @@ index 5da9c2a695..0ec03b84b7 100644 if(WITH_CAROTENE) ocv_debug_message(STATUS "Enable carotene acceleration") if(NOT ";${OpenCV_HAL};" MATCHES ";carotene;") -@@ -979,6 +988,10 @@ foreach(hal ${OpenCV_HAL}) +@@ -979,6 +990,10 @@ foreach(hal ${OpenCV_HAL}) else() message(STATUS "Carotene: NEON is not available, disabling carotene...") endif() diff --git a/adapters/opencv/opencv-5.x.patch b/adapters/opencv/opencv-5.x.patch index 8558e94b22473847ddf40544f7e1fc2849cf13b3..6bbc8a8e944bba3e77ea970a2e9bcbabb024cd46 100644 --- a/adapters/opencv/opencv-5.x.patch +++ b/adapters/opencv/opencv-5.x.patch @@ -12,10 +12,19 @@ index 0000000000..c0ffb73ad7 + +include("${INTRINSICCV_SOURCE_PATH}/adapters/opencv/CMakeLists.txt") diff --git a/CMakeLists.txt b/CMakeLists.txt -index d462ccf1a5..76a48e2886 100644 +index 4a628c1a6a..999df2657d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -259,6 +259,8 @@ OCV_OPTION(WITH_CAP_IOS "Enable iOS video capture" ON +@@ -13,6 +13,8 @@ FATAL: In-source builds are not allowed. + ") + endif() + ++# Useful for HALs if built as a CMake submodule ++set(OPENCV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + + include(cmake/OpenCVMinDepVersions.cmake) + +@@ -259,6 +261,8 @@ OCV_OPTION(WITH_CAP_IOS "Enable iOS video capture" ON VERIFY HAVE_CAP_IOS) OCV_OPTION(WITH_CAROTENE "Use NVidia carotene acceleration library for ARM platform" (NOT CV_DISABLE_OPTIMIZATION) VISIBLE_IF (ARM OR AARCH64) AND NOT IOS AND NOT XROS) @@ -24,7 +33,7 @@ index d462ccf1a5..76a48e2886 100644 OCV_OPTION(WITH_CPUFEATURES "Use cpufeatures Android library" ON VISIBLE_IF ANDROID VERIFY HAVE_CPUFEATURES) -@@ -958,6 +960,13 @@ if(HAVE_OPENVX) +@@ -956,6 +960,13 @@ if(HAVE_OPENVX) endif() endif() @@ -38,7 +47,7 @@ index d462ccf1a5..76a48e2886 100644 if(WITH_CAROTENE) ocv_debug_message(STATUS "Enable carotene acceleration") if(NOT ";${OpenCV_HAL};" MATCHES ";carotene;") -@@ -982,6 +991,10 @@ foreach(hal ${OpenCV_HAL}) +@@ -980,6 +991,10 @@ foreach(hal ${OpenCV_HAL}) else() message(STATUS "Carotene: NEON is not available, disabling carotene...") endif()