Skip to content
This repository was archived by the owner on Mar 22, 2020. It is now read-only.

Commit 08a9e94

Browse files
committed
Fix Accelerate.framework full path
1 parent a565cb6 commit 08a9e94

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

cmake/templates/OpenCVConfig.cmake.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@)
108108
set(OpenCV_LIB_COMPONENTS @OPENCV_MODULES_CONFIGCMAKE@)
109109
set(OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@)
110110

111+
if(APPLE)
112+
find_package(accelerate REQUIRED)
113+
endif()
114+
111115
if(NOT TARGET opencv_core)
112116
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${OpenCV_MODULES_SUFFIX}.cmake)
113117
endif()
@@ -372,4 +376,3 @@ if("@Qt5OpenGL_FOUND@")
372376
find_dependency(Qt5OpenGL)
373377
endif()
374378
# AWP: Qt5 dependencies -- end
375-

modules/core/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,16 @@ endif()
7070

7171
ocv_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+
7380
ocv_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
)

modules/dnn/CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,15 @@ endif()
7878

7979
set(include_dirs ${fw_inc})
8080
set(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})
8290
if(OPENCV_DNN_OPENCL AND HAVE_OPENCL)
8391
list(APPEND include_dirs ${OPENCL_INCLUDE_DIRS})
8492
else()

0 commit comments

Comments
 (0)