]>
Commit | Line | Data |
---|---|---|
e652d7a7 JR |
1 | --- opencv-4.5.1/cmake/OpenCVGenPkgconfig.cmake~ 2020-12-21 21:01:38.000000000 +0100 |
2 | +++ opencv-4.5.1/cmake/OpenCVGenPkgconfig.cmake 2021-03-07 10:47:09.068714587 +0100 | |
3 | @@ -124,14 +124,14 @@ | |
4 | ocv_list_unique(_3rdparty) | |
5 | ||
6 | set(OPENCV_PC_LIBS | |
7 | - "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" | |
8 | + "-L${OPENCV_LIB_INSTALL_PATH}" | |
9 | "${_modules}" | |
10 | ) | |
11 | if(BUILD_SHARED_LIBS) | |
12 | set(OPENCV_PC_LIBS_PRIVATE "${_extra}") | |
13 | else() | |
14 | set(OPENCV_PC_LIBS_PRIVATE | |
15 | - "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" | |
16 | + "-L${OPENCV_3P_LIB_INSTALL_PATH}" | |
17 | "${_3rdparty}" | |
18 | "${_extra}" | |
19 | ) | |
20 | @@ -142,8 +142,8 @@ | |
21 | #generate the .pc file | |
22 | set(prefix "${CMAKE_INSTALL_PREFIX}") | |
23 | set(exec_prefix "\${prefix}") | |
24 | -set(libdir "\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}") | |
25 | -set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") | |
26 | +set(libdir "${OPENCV_LIB_INSTALL_PATH}") | |
27 | +set(includedir "${OPENCV_INCLUDE_INSTALL_PATH}") | |
28 | ||
29 | configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/opencv-XXX.pc.in" | |
30 | "${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME}" |