2013-11-12 23:13:01 +00:00
|
|
|
diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
|
|
|
|
|
--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000
|
|
|
|
|
+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:41:48.936262732 +0000
|
2012-11-17 07:36:21 +00:00
|
|
|
@@ -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}")
|
|
|
|
|
|
2013-11-12 23:13:01 +00:00
|
|
|
if(CMAKE_BUILD_TYPE MATCHES "Release")
|
|
|
|
|
@@ -35,10 +35,11 @@
|
2012-11-17 07:36:21 +00:00
|
|
|
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})
|
|
|
|
|
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}")
|
2013-11-12 23:13:01 +00:00
|
|
|
@@ -51,7 +52,8 @@
|
2012-11-17 07:36:21 +00:00
|
|
|
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}")
|
|
|
|
|
endforeach()
|
|
|
|
|
|
|
|
|
|
# add extra dependencies required for OpenCV
|
