potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #8970 from alalek:fix_libname_2.4

Browse Source 
(2.4) cmake: fix libname for pkg-config configuration
This commit is contained in:
Alexander Alekhin
2017-06-25 14:16:46 +03:00
committed by GitHub
parent 07b7c03efc 70489b1e22
commit 3dedd62f54
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVGenPkgconfig.cmake
+2 -2
View File
@@ -74,8 +74,8 @@ if(OpenCV_EXTRA_COMPONENTS)
list(APPEND OpenCV_LIB_COMPONENTS_ "${extra_component}")
elseif(extra_component MATCHES "[\\/]")
get_filename_component(libdir "${extra_component}" PATH)
get_filename_component(libname "${extra_component}" NAME_WE)
string(REGEX REPLACE "^lib" "" libname "${libname}")
get_filename_component(libname "${extra_component}" NAME)
ocv_get_libname(libname "${libname}")
list(APPEND OpenCV_LIB_COMPONENTS_ "-L${libdir}" "-l${libname}")
else()
list(APPEND OpenCV_LIB_COMPONENTS_ "-l${extra_component}")
cmake/OpenCVUtils.cmake
+6
View File
@@ -749,6 +749,12 @@ function(ocv_source_group group)
source_group(${group} FILES ${srcs})
endfunction()
macro(ocv_get_libname var_name)
get_filename_component(__libname "${ARGN}" NAME)
string(REGEX REPLACE "^lib(.+).(a|so)(.[.0-9]+)?$" "\\1" __libname "${__libname}")
set(${var_name} "${__libname}")
endmacro()
# build the list of simple dependencies, that links via "-l"
# _all_libs - name of variable with input list
# _simple - name of variable with output list of simple libs