mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
opencv: Fix pkg-config file.
Libdir was pointing to the wrong location also fix for QA Issue: opencv.pc failed sanity test (tmpdir) in path Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
bf0f22ab95
commit
3c1e8556d7
@@ -0,0 +1,29 @@
|
|||||||
|
diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
|
||||||
|
index b8cb8777c06b..75281ee964fd 100644
|
||||||
|
--- a/cmake/OpenCVGenPkgconfig.cmake
|
||||||
|
+++ b/cmake/OpenCVGenPkgconfig.cmake
|
||||||
|
@@ -27,7 +27,7 @@ macro(fix_prefix lst isown)
|
||||||
|
get_filename_component(libdir "${item}" PATH)
|
||||||
|
get_filename_component(libname "${item}" NAME_WE)
|
||||||
|
string(REGEX REPLACE "^lib(.*)" "\\1" libname "${libname}")
|
||||||
|
- list(APPEND _lst "-L${libdir}" "-l${libname}")
|
||||||
|
+ list(APPEND _lst "-l${libname}")
|
||||||
|
else()
|
||||||
|
list(APPEND _lst "-l${item}")
|
||||||
|
endif()
|
||||||
|
@@ -66,10 +66,14 @@ ocv_list_unique(_3rdparty)
|
||||||
|
|
||||||
|
set(OPENCV_PC_LIBS
|
||||||
|
"-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
|
||||||
|
+ "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
|
||||||
|
"${_modules}"
|
||||||
|
)
|
||||||
|
if (BUILD_SHARED_LIBS)
|
||||||
|
- set(OPENCV_PC_LIBS_PRIVATE "${_extra}")
|
||||||
|
+ set(OPENCV_PC_LIBS_PRIVATE
|
||||||
|
+ "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
|
||||||
|
+ "${_extra}"
|
||||||
|
+ )
|
||||||
|
else()
|
||||||
|
set(OPENCV_PC_LIBS_PRIVATE
|
||||||
|
"-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
|
||||||
@@ -16,7 +16,8 @@ SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a"
|
|||||||
SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
|
SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c"
|
||||||
SRCREV_FORMAT = "opencv"
|
SRCREV_FORMAT = "opencv"
|
||||||
SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
|
SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
|
||||||
git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib"
|
git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \
|
||||||
|
file://fixpkgconfig.patch"
|
||||||
|
|
||||||
PV = "3.1+git${SRCPV}"
|
PV = "3.1+git${SRCPV}"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user