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

11 years ago · 5bd5993663
parent 70df365c87
commit 5bd5993663
1 changed files with 7 additions and 1 deletions
--- a/cmake/OpenCVGenPkgconfig.cmake
+++ b/cmake/OpenCVGenPkgconfig.cmake
@ -58,7 +58,13 @@ endforeach()
 set(OpenCV_LIB_COMPONENTS ${OpenCV_LIB_COMPONENTS_})
 if(OpenCV_EXTRA_COMPONENTS)
  foreach(extra_component ${OpenCV_EXTRA_COMPONENTS})
+    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()
 endif()