diff options
| author | Valentin Churavy | 2015-06-09 14:18:24 +0900 |
|---|---|---|
| committer | Valentin Churavy | 2015-06-09 14:18:24 +0900 |
| commit | 3531e66b4db203df84baa7eeadf954b0b355af9c (patch) | |
| tree | e3a5550f9e0fcf80882e633f8ef759a225340487 /pkgconfig.patch | |
| download | aur-3531e66b4db203df84baa7eeadf954b0b355af9c.tar.gz | |
inital commit for aur4
Diffstat (limited to 'pkgconfig.patch')
| -rw-r--r-- | pkgconfig.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/pkgconfig.patch b/pkgconfig.patch new file mode 100644 index 000000000000..c2f147139fce --- /dev/null +++ b/pkgconfig.patch @@ -0,0 +1,49 @@ +From 2c09e55ce124390d6ab905d2c8b15084b032f759 Mon Sep 17 00:00:00 2001 +From: Valentin Churavy <v.churavy@gmail.com> +Date: Sat, 28 Mar 2015 01:27:16 +0900 +Subject: [PATCH 1/2] pkgconfig.patch + +--- + cmake/OpenCVGenPkgconfig.cmake | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +index a8686e8..ac42445 100644 +--- a/cmake/OpenCVGenPkgconfig.cmake ++++ b/cmake/OpenCVGenPkgconfig.cmake +@@ -10,7 +10,7 @@ + # ------------------------------------------------------------------------------------------- + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +-set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS ++set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}") + set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") + + if(CMAKE_BUILD_TYPE MATCHES "Release") +@@ -35,11 +35,12 @@ ocv_list_reverse(OpenCV_LIB_COMPONENTS) + ocv_list_reverse(OpenCV_EXTRA_COMPONENTS) + + #build the list of components +-set(OpenCV_LIB_COMPONENTS_ "") ++set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}") + foreach(CVLib ${OpenCV_LIB_COMPONENTS}) + if (TARGET ${CVLib}) + get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE}) + get_filename_component(libname "${libpath}" NAME) ++ get_filename_component(lname "${libpath}" NAME_WE) + + if(INSTALL_TO_MANGLED_PATHS) + set(libname "${libname}.${OPENCV_VERSION}") +@@ -52,7 +53,8 @@ foreach(CVLib ${OpenCV_LIB_COMPONENTS}) + set(installDir "${OPENCV_LIB_INSTALL_PATH}") + endif() + +- set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}") ++ string(REPLACE "libopencv" "-lopencv" lname "${lname}") ++ set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}") + endif() + endforeach() + +-- +2.3.4 + |