This repository was archived by the owner on Mar 22, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +21
-3
lines changed
Expand file tree Collapse file tree 3 files changed +21
-3
lines changed Original file line number Diff line number Diff line change @@ -108,6 +108,10 @@ set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@)
108108set (OpenCV_LIB_COMPONENTS @OPENCV_MODULES_CONFIGCMAKE@)
109109set (OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@)
110110
111+ if (APPLE )
112+ find_package (accelerate REQUIRED)
113+ endif ()
114+
111115if (NOT TARGET opencv_core)
112116 include (${CMAKE_CURRENT_LIST_DIR} /OpenCVModules${OpenCV_MODULES_SUFFIX} .cmake)
113117endif ()
@@ -372,4 +376,3 @@ if("@Qt5OpenGL_FOUND@")
372376 find_dependency(Qt5OpenGL)
373377endif ()
374378# AWP: Qt5 dependencies -- end
375-
Original file line number Diff line number Diff line change @@ -70,9 +70,16 @@ endif()
7070
7171ocv_create_module(${extra_libs} )
7272
73+ if (HUNTER_ENABLED AND APPLE )
74+ find_package (accelerate REQUIRED)
75+ set (__lapack_libraries accelerate::accelerate)
76+ else ()
77+ set (__lapack_libraries ${LAPACK_LIBRARIES} )
78+ endif ()
79+
7380ocv_target_link_libraries(${the_module} LINK_PRIVATE
7481 "${ZLIB_LIBRARIES} " "${OPENCL_LIBRARIES} " "${VA_LIBRARIES} "
75- "${LAPACK_LIBRARIES } " "${CPUFEATURES_LIBRARIES} " "${HALIDE_LIBRARIES} "
82+ "${__lapack_libraries } " "${CPUFEATURES_LIBRARIES} " "${HALIDE_LIBRARIES} "
7683 "${ITT_LIBRARIES} "
7784 "${OPENCV_HAL_LINKER_LIBS} "
7885)
Original file line number Diff line number Diff line change @@ -78,7 +78,15 @@ endif()
7878
7979set (include_dirs ${fw_inc} )
8080set (sources_options "" )
81- set (libs libprotobuf ${LAPACK_LIBRARIES} )
81+
82+ if (HUNTER_ENABLED AND APPLE )
83+ find_package (accelerate REQUIRED)
84+ set (__lapack_libraries accelerate::accelerate)
85+ else ()
86+ set (__lapack_libraries ${LAPACK_LIBRARIES} )
87+ endif ()
88+
89+ set (libs libprotobuf ${__lapack_libraries} )
8290if (OPENCV_DNN_OPENCL AND HAVE_OPENCL)
8391 list (APPEND include_dirs ${OPENCL_INCLUDE_DIRS} )
8492else ()
You can’t perform that action at this time.
0 commit comments