From 5fe2eca8e7851880750e5b32332e85214151ed18 Mon Sep 17 00:00:00 2001 From: Denes Tarjan Date: Mon, 2 Jun 2025 13:01:35 +0000 Subject: [PATCH] Fix the OpenCV HAL CMake config for static build --- adapters/opencv/CMakeLists.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/adapters/opencv/CMakeLists.txt b/adapters/opencv/CMakeLists.txt index 2e5cb2ffb..a7adb1c14 100644 --- a/adapters/opencv/CMakeLists.txt +++ b/adapters/opencv/CMakeLists.txt @@ -8,11 +8,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../kleidicv_thread/CMakeLists.txt") project("KleidiCV OpenCV HAL") set(KLEIDICV_HAL_VERSION "0.5.0" CACHE INTERNAL "") -set(KLEIDICV_HAL_LIBRARIES "kleidicv_hal" CACHE INTERNAL "") +set(KLEIDICV_HAL_LIBRARIES "kleidicv_hal" "kleidicv" "kleidicv_thread" CACHE INTERNAL "") set(KLEIDICV_HAL_HEADERS "${CMAKE_CURRENT_LIST_DIR}/kleidicv_hal.h" CACHE INTERNAL "") set(KLEIDICV_HAL_INCLUDE_DIRS "$" CACHE INTERNAL "") -add_library(kleidicv_hal STATIC "${CMAKE_CURRENT_LIST_DIR}/kleidicv_hal.cpp") +add_library(kleidicv_hal STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} "${CMAKE_CURRENT_LIST_DIR}/kleidicv_hal.cpp") target_link_libraries(kleidicv_hal PUBLIC kleidicv kleidicv_thread) target_include_directories(kleidicv_hal PRIVATE ${KLEIDICV_HAL_INCLUDE_DIRS} @@ -27,7 +27,18 @@ target_compile_options( "-Wno-old-style-cast" ) -set_target_properties(kleidicv_hal PROPERTIES CXX_STANDARD 17) +set_target_properties(kleidicv_hal + PROPERTIES CXX_STANDARD 17 + ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH} +) + +set_target_properties(kleidicv + PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH} +) + +set_target_properties(kleidicv_thread + PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH} +) if(NOT BUILD_SHARED_LIBS) ocv_install_target(kleidicv_neon -- GitLab