generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only append -l to lib entries with no path and no -l or -L of their own

Browse Source
This commit is contained in:
Greg Hale 2013-10-17 14:05:06 -04:00
parent 70df365c87
commit 5bd5993663
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/OpenCVGenPkgconfig.cmake
View File

@ -58,7 +58,13 @@ endforeach()
set(OpenCV_LIB_COMPONENTS ${OpenCV_LIB_COMPONENTS_}) set(OpenCV_LIB_COMPONENTS ${OpenCV_LIB_COMPONENTS_})
if(OpenCV_EXTRA_COMPONENTS) if(OpenCV_EXTRA_COMPONENTS)
foreach(extra_component ${OpenCV_EXTRA_COMPONENTS}) foreach(extra_component ${OpenCV_EXTRA_COMPONENTS})
set(OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS} -l${extra_component}") if(extra_component MATCHES "-[lL](.*)" )
set(OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS} ${extra_component}")
elseif(extra_component MATCHES "/")
set(OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS} ${extra_component}")
else()
set(OpenCV_LIB_COMPONENTS "${OpenCV_LIB_COMPONENTS} -l${extra_component}")
endif()
endforeach() endforeach()
endif() endif()