pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics
Module Name: pkgsrc
Committed By: thor
Date: Fri Dec 22 07:35:07 UTC 2023
Modified Files:
pkgsrc/graphics/opencv: Makefile Makefile.common distinfo
pkgsrc/graphics/opencv-contrib-face: Makefile distinfo
pkgsrc/graphics/opencv/patches: patch-CMakeLists.txt
Added Files:
pkgsrc/graphics/opencv/patches: patch-cmake_OpenCVFindLAPACK.cmake
Removed Files:
pkgsrc/graphics/opencv/patches: patch-cmake_OpenCVFindOpenEXR.cmake
patch-cmake_checks_lapack__check.cpp
patch-modules_core_src_hal__internal.cpp
Log Message:
opencv: version 3.4.17 with proper explicit BLAS (CBLAS + LAPACKE) usage
This does the small bugfix update from 3.4.16 to 3.4.17 and adds proper usage
of BLAS stuff. There was linkage to BLAS before via numpy, but the internal
explicit BLAS-using code was not built, as the CMake machinery did not find it.
This commit drops an actually counterproductive patch and adds pkg-config
calls to find the BLAS-related libraries. Note that vor opencv-contrib-face,
the BLAS choice during its build doesn't really enter the result, apparently,
but the build process does use it and it would not help to confuse matters there.
I am not sure if the buildlink3.mk should also add blas.buildlink3.mk now. It
does not feature numpy right now. Should it?
Next step should be move towards 4.x at least.
Upstream:
December, 2021
OpenCV 3.4.17 has been released. Bug fixes, optimizations and other enhancements
are propagated into OpenCV 4.5.5.
Long-lived OpenCV 3.x release series is here since 2015. We are going to reduce
support of 3.x branch in the future to move forward to OpenCV 5.0.
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/opencv/Makefile.common
cvs rdiff -u -r1.57 -r1.58 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/opencv-contrib-face/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/opencv-contrib-face/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake
cvs rdiff -u -r1.1 -r0 \
pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindOpenEXR.cmake \
pkgsrc/graphics/opencv/patches/patch-cmake_checks_lapack__check.cpp \
pkgsrc/graphics/opencv/patches/patch-modules_core_src_hal__internal.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.122 pkgsrc/graphics/opencv/Makefile:1.123
--- pkgsrc/graphics/opencv/Makefile:1.122 Wed Nov 15 20:00:39 2023
+++ pkgsrc/graphics/opencv/Makefile Fri Dec 22 07:35:07 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.122 2023/11/15 20:00:39 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2023/12/22 07:35:07 thor Exp $
-PKGREVISION= 22
.include "Makefile.common"
DISTNAME= opencv-${OPENCV_VERSION}
Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.17 pkgsrc/graphics/opencv/Makefile.common:1.18
--- pkgsrc/graphics/opencv/Makefile.common:1.17 Thu Nov 2 21:48:51 2023
+++ pkgsrc/graphics/opencv/Makefile.common Fri Dec 22 07:35:07 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.17 2023/11/02 21:48:51 wiz Exp $
+# $NetBSD: Makefile.common,v 1.18 2023/12/22 07:35:07 thor Exp $
# used by graphics/opencv/Makefile
# used by graphics/opencv-contrib-face/Makefile
#
# DO NOT FORGET to regen graphics/opencv-contrib-face/distinfo!
-OPENCV_VERSION= 3.4.16
+OPENCV_VERSION= 3.4.17
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
@@ -36,6 +36,17 @@ CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PR
CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
+# Pulled in via numpy, too, but we need to handle it explicitly
+# for LAPACK C API and CMake tests here.
+BLAS_C_INTERFACE= yes
+.include "../../mk/blas.buildlink3.mk"
+CMAKE_ARGS+= -DWITH_LAPACK=ON
+CMAKE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
+CMAKE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+CMAKE_ARGS+= -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
+CMAKE_ARGS+= -DBLA_PKGCONFIG_CBLAS=${CBLAS_PC}
+CMAKE_ARGS+= -DBLA_PKGCONFIG_LAPACKE=${LAPACKE_PC}
+
BUILDLINK_TRANSFORM+= rm:-Werror=address
BUILDLINK_TRANSFORM+= rm:-Werror=non-virtual-dtor
Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.57 pkgsrc/graphics/opencv/distinfo:1.58
--- pkgsrc/graphics/opencv/distinfo:1.57 Tue Oct 26 10:46:34 2021
+++ pkgsrc/graphics/opencv/distinfo Fri Dec 22 07:35:07 2023
@@ -1,22 +1,20 @@
-$NetBSD: distinfo,v 1.57 2021/10/26 10:46:34 nia Exp $
+$NetBSD: distinfo,v 1.58 2023/12/22 07:35:07 thor Exp $
-BLAKE2s (opencv-3.4.16.tar.gz) = 153eb897082e2f0b98bd5bee22fdff8a7c5d3f0cb2276f90ae2232286e34ebde
-SHA512 (opencv-3.4.16.tar.gz) = 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a
-Size (opencv-3.4.16.tar.gz) = 87694121 bytes
+BLAKE2s (opencv-3.4.17.tar.gz) = f8cbf244836026ef700534a4aa35a96f0e1521a6a5aa05ffecb90b1cdbcb75d3
+SHA512 (opencv-3.4.17.tar.gz) = b17a4a04ab29f0f966681a825af782039a2cc6564956894aba639731542fdb86d316b16b96e2d45de8b5e0db7c79ce4b4c348b82ccd124d125aacb7c02026841
+Size (opencv-3.4.17.tar.gz) = 87758183 bytes
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
-SHA1 (patch-CMakeLists.txt) = 029368ab14163640d1651f572810eb8eb0c043d9
+SHA1 (patch-CMakeLists.txt) = 86a524683091aad65dfaf719d56c5f76056596b6
SHA1 (patch-apps_visualisation_opencv__visualisation.cpp) = b62c32172049c6369fd62a5c72325eef995fd1d0
SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
-SHA1 (patch-cmake_OpenCVFindOpenEXR.cmake) = 202d0fdc84464d563dead955d5299b42098d52a6
-SHA1 (patch-cmake_checks_lapack__check.cpp) = dd25d34fff25e0d46651789cf5577391d7b48c81
+SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = e8c474d91ba6de7c3204fcd753a33d33847b18b8
SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
SHA1 (patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp) = f0cff24b2a760086f54ab66536bdfee4f4f1a6d7
SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
SHA1 (patch-modules_core_src_check.cpp) = c8dac4e0fb6fa4a0dca6a2794bd598ba114e78b6
SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
-SHA1 (patch-modules_core_src_hal__internal.cpp) = 22beba5ee93fc468999479227d7ef07397848b22
SHA1 (patch-modules_core_src_rand.cpp) = aa87ee5a538deb1a2ed3e89dd3dd4ee9b86ae0de
SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
SHA1 (patch-modules_dnn_src_layers_accum__layer.cpp) = 20a12489f7e7fcbc90d47871f12ac500ab8ae6ed
Index: pkgsrc/graphics/opencv-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.34 pkgsrc/graphics/opencv-contrib-face/Makefile:1.35
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.34 Wed Nov 15 20:00:39 2023
+++ pkgsrc/graphics/opencv-contrib-face/Makefile Fri Dec 22 07:35:07 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.34 2023/11/15 20:00:39 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2023/12/22 07:35:07 thor Exp $
-PKGREVISION= 13
.include "../../graphics/opencv/Makefile.common"
DISTNAME= opencv_contrib-${OPENCV_VERSION}
Index: pkgsrc/graphics/opencv-contrib-face/distinfo
diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.26 pkgsrc/graphics/opencv-contrib-face/distinfo:1.27
--- pkgsrc/graphics/opencv-contrib-face/distinfo:1.26 Mon Nov 15 17:49:44 2021
+++ pkgsrc/graphics/opencv-contrib-face/distinfo Fri Dec 22 07:35:07 2023
@@ -1,25 +1,23 @@
-$NetBSD: distinfo,v 1.26 2021/11/15 17:49:44 wiz Exp $
+$NetBSD: distinfo,v 1.27 2023/12/22 07:35:07 thor Exp $
-BLAKE2s (opencv-3.4.16.tar.gz) = 153eb897082e2f0b98bd5bee22fdff8a7c5d3f0cb2276f90ae2232286e34ebde
-SHA512 (opencv-3.4.16.tar.gz) = 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a
-Size (opencv-3.4.16.tar.gz) = 87694121 bytes
-BLAKE2s (opencv_contrib-3.4.16.tar.gz) = d117c1d7b7fc42e52ce6484efb7aaf002e34330061d6037ff66d4a3b1f3b1d18
-SHA512 (opencv_contrib-3.4.16.tar.gz) = 31bd55617d3a54fa020d4255e463c90caf41e10136c82a05c24ee19890f0cdc4fc049136874841dc84037dedb0562471ea0345ab1dcd5ad8a5b0218f24ae9a35
-Size (opencv_contrib-3.4.16.tar.gz) = 55215391 bytes
+BLAKE2s (opencv-3.4.17.tar.gz) = f8cbf244836026ef700534a4aa35a96f0e1521a6a5aa05ffecb90b1cdbcb75d3
+SHA512 (opencv-3.4.17.tar.gz) = b17a4a04ab29f0f966681a825af782039a2cc6564956894aba639731542fdb86d316b16b96e2d45de8b5e0db7c79ce4b4c348b82ccd124d125aacb7c02026841
+Size (opencv-3.4.17.tar.gz) = 87758183 bytes
+BLAKE2s (opencv_contrib-3.4.17.tar.gz) = 35896b85853444d826d574903a6b8d61fea93b7ab0d8d77292eb98b7507f3858
+SHA512 (opencv_contrib-3.4.17.tar.gz) = 33be143aa3a3b30fd903e4d3c4ae6b26911171d956fe40fd2b38df37855822547013f44470271a366fbfecf6efbaa746cd9aea3088a71028752bff0bda90a00f
+Size (opencv_contrib-3.4.17.tar.gz) = 54708858 bytes
SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
-SHA1 (patch-CMakeLists.txt) = 029368ab14163640d1651f572810eb8eb0c043d9
+SHA1 (patch-CMakeLists.txt) = 86a524683091aad65dfaf719d56c5f76056596b6
SHA1 (patch-apps_visualisation_opencv__visualisation.cpp) = b62c32172049c6369fd62a5c72325eef995fd1d0
SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
-SHA1 (patch-cmake_OpenCVFindOpenEXR.cmake) = 202d0fdc84464d563dead955d5299b42098d52a6
-SHA1 (patch-cmake_checks_lapack__check.cpp) = dd25d34fff25e0d46651789cf5577391d7b48c81
+SHA1 (patch-cmake_OpenCVFindLAPACK.cmake) = e8c474d91ba6de7c3204fcd753a33d33847b18b8
SHA1 (patch-modules_core_include_opencv2_core_bindings__utils.hpp) = 44a8602670141b2a3bc90c5e1c23a8e7f96a1d40
SHA1 (patch-modules_core_include_opencv2_core_opencl_opencl__info.hpp) = f0cff24b2a760086f54ab66536bdfee4f4f1a6d7
SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
SHA1 (patch-modules_core_src_check.cpp) = c8dac4e0fb6fa4a0dca6a2794bd598ba114e78b6
SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
-SHA1 (patch-modules_core_src_hal__internal.cpp) = 22beba5ee93fc468999479227d7ef07397848b22
SHA1 (patch-modules_core_src_rand.cpp) = aa87ee5a538deb1a2ed3e89dd3dd4ee9b86ae0de
SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
SHA1 (patch-modules_dnn_src_layers_accum__layer.cpp) = 20a12489f7e7fcbc90d47871f12ac500ab8ae6ed
Index: pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.9 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.10
--- pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.9 Sun Dec 29 10:00:08 2019
+++ pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt Fri Dec 22 07:35:07 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.9 2019/12/29 10:00:08 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.10 2023/12/22 07:35:07 thor Exp $
Don't add to CMAKE_LIBRARY_PATH, may cause other versions of packages
to be found in preference to pkgsrc ones.
Do not build third party libraries on Darwin.
---- CMakeLists.txt.orig 2019-10-09 11:42:29.000000000 +0000
+--- CMakeLists.txt.orig 2021-12-24 16:39:15.000000000 +0000
+++ CMakeLists.txt
-@@ -151,34 +151,6 @@ OCV_OPTION(ENABLE_CXX11 "Enable C++11 co
+@@ -169,34 +169,6 @@ OCV_OPTION(ENABLE_CXX11 "Enable C++11 co
include(cmake/OpenCVDetectCXXCompiler.cmake)
ocv_cmake_hook(POST_DETECT_COMPILER)
@@ -41,7 +41,7 @@ Do not build third party libraries on Da
# Add these standard paths to the search paths for FIND_PATH
# to find include files from these locations first
if(MINGW)
-@@ -201,13 +173,13 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable
+@@ -219,13 +191,13 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable
# 3rd party libs
OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD "Force using 3rdparty code from source" OFF)
@@ -50,14 +50,13 @@ Do not build third party libraries on Da
-OCV_OPTION(BUILD_JASPER "Build libjasper from source" (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
-OCV_OPTION(BUILD_JPEG "Build libjpeg from source" (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
-OCV_OPTION(BUILD_PNG "Build libpng from source" (WIN32 OR ANDROID OR APPLE OR OPENCV_FORCE_3RDPARTY_BUILD) )
--OCV_OPTION(BUILD_OPENEXR "Build openexr from source" (((WIN32 OR ANDROID OR APPLE) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) )
--OCV_OPTION(BUILD_WEBP "Build WebP from source" (((WIN32 OR ANDROID OR APPLE) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) )
+OCV_OPTION(BUILD_ZLIB "Build zlib from source" (WIN32 OR OPENCV_FORCE_3RDPARTY_BUILD) )
+OCV_OPTION(BUILD_TIFF "Build libtiff from source" (WIN32 OR ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) )
+OCV_OPTION(BUILD_JASPER "Build libjasper from source" (WIN32 OR ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) )
+OCV_OPTION(BUILD_JPEG "Build libjpeg from source" (WIN32 OR ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) )
+OCV_OPTION(BUILD_PNG "Build libpng from source" (WIN32 OR ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) )
-+OCV_OPTION(BUILD_OPENEXR "Build openexr from source" (((WIN32 OR ANDROID) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) )
+ OCV_OPTION(BUILD_OPENEXR "Build openexr from source" (OPENCV_FORCE_3RDPARTY_BUILD) )
+-OCV_OPTION(BUILD_WEBP "Build WebP from source" (((WIN32 OR ANDROID OR APPLE) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) )
+OCV_OPTION(BUILD_WEBP "Build WebP from source" (((WIN32 OR ANDROID) AND NOT WINRT) OR OPENCV_FORCE_3RDPARTY_BUILD) )
OCV_OPTION(BUILD_TBB "Download and build TBB from source" (ANDROID OR OPENCV_FORCE_3RDPARTY_BUILD) )
OCV_OPTION(BUILD_IPP_IW "Build IPP IW from source" (NOT MINGW OR OPENCV_FORCE_3RDPARTY_BUILD) IF (X86_64 OR X86) AND NOT WINRT )
Added files:
Index: pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake:1.1
--- /dev/null Fri Dec 22 07:35:07 2023
+++ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVFindLAPACK.cmake Fri Dec 22 07:35:07 2023
@@ -0,0 +1,36 @@
+$NetBSD: patch-cmake_OpenCVFindLAPACK.cmake,v 1.1 2023/12/22 07:35:07 thor Exp $
+
+--- cmake/OpenCVFindLAPACK.cmake.orig 2021-12-24 16:39:15.000000000 +0000
++++ cmake/OpenCVFindLAPACK.cmake
+@@ -84,7 +84,7 @@ macro(ocv_lapack_check)
+ OUTPUT_VARIABLE TRY_OUT
+ )
+ if(NOT __VALID_LAPACK)
+- #message(FATAL_ERROR "LAPACK: check build log:\n${TRY_OUT}")
++ message(FATAL_ERROR "LAPACK: check build log:\n${TRY_OUT}")
+ message(STATUS "LAPACK(${LAPACK_IMPL}): Can't build LAPACK check code. This LAPACK version is not supported.")
+ unset(LAPACK_LIBRARIES)
+ else()
+@@ -98,6 +98,22 @@ endmacro()
+ if(WITH_LAPACK)
+ ocv_update(LAPACK_IMPL "Unknown")
+ if(NOT OPENCV_LAPACK_FIND_PACKAGE_ONLY)
++ # Mimicking cmake's FindBLAS with BLA_PREFER_PKGCONFIG
++ if(NOT LAPACK_LIBRARIES AND BLA_PREFER_PKGCONFIG)
++ find_package(PkgConfig)
++ pkg_search_module(PKG_BLAS ${BLA_PKGCONFIG_BLAS} blas)
++ pkg_search_module(PKG_LAPACK ${BLA_PKGCONFIG_LAPACK} lapack)
++ pkg_search_module(PKG_CBLAS ${BLA_PKGCONFIG_CBLAS} cblas)
++ pkg_search_module(PKG_LAPACKE ${BLA_PKGCONFIG_LAPACKE} lapacke)
++ if(PKG_BLAS_FOUND AND PKG_LAPACK_FOUND AND PKG_CBLAS_FOUND AND PKG_LAPACKE_FOUND)
++ set(LAPACK_INCLUDE_DIR ${PKG_CBLAS_INCLUDE_DIRS} ${PKG_LAPACKE_INCLUDE_DIRS} ${PKG_BLAS_INCLUDE_DIRS} ${PKG_LAPACK_INCLUDE_DIRS})
++ set(LAPACK_LIBRARIES ${PKG_CBLAS_LIBRARIES} ${PKG_LAPACKE_LIBRARIES} ${PKG_BLAS_LIBRARIES} ${PKG_LAPACK_LIBRARIES})
++ set(LAPACK_CBLAS_H "cblas.h")
++ set(LAPACK_LAPACKE_H "lapacke.h")
++ set(LAPACK_IMPL "pkg")
++ ocv_lapack_check()
++ endif()
++ endif()
+ if(NOT LAPACK_LIBRARIES AND NOT OPENCV_LAPACK_DISABLE_MKL)
+ include(cmake/OpenCVFindMKL.cmake)
+ if(HAVE_MKL)
Home |
Main Index |
Thread Index |
Old Index