| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | Index: git/cmake/OpenCVGenPkgconfig.cmake |
| 2 | =================================================================== |
| 3 | --- git.orig/cmake/OpenCVGenPkgconfig.cmake |
| 4 | +++ git/cmake/OpenCVGenPkgconfig.cmake |
| 5 | @@ -31,7 +31,7 @@ macro(fix_prefix lst isown) |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 6 | get_filename_component(libdir "${item}" PATH) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 7 | get_filename_component(_libname "${item}" NAME) |
| 8 | ocv_get_libname(libname "${_libname}") |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 9 | - list(APPEND _lst "-L${libdir}" "-l${libname}") |
| 10 | + list(APPEND _lst "-l${libname}") |
| 11 | else() |
| 12 | list(APPEND _lst "-l${item}") |
| 13 | endif() |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 14 | @@ -124,11 +124,14 @@ ocv_list_unique(_extra) |
| 15 | ocv_list_unique(_3rdparty) |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 16 | |
| 17 | set(OPENCV_PC_LIBS |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 18 | - "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 19 | + "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" |
| 20 | "${_modules}" |
| 21 | ) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 22 | if(BUILD_SHARED_LIBS) |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 23 | - set(OPENCV_PC_LIBS_PRIVATE "${_extra}") |
| 24 | + set(OPENCV_PC_LIBS_PRIVATE |
| 25 | + "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" |
| 26 | + "${_extra}" |
| 27 | + ) |
| 28 | else() |
| 29 | set(OPENCV_PC_LIBS_PRIVATE |
| 30 | "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" |