Only append -l to lib entries with no path and no -l or -L of their own
authorGreg Hale <imalsogreg@gmail.com>
Thu, 17 Oct 2013 18:05:06 +0000 (14:05 -0400)
committerGreg Hale <imalsogreg@gmail.com>
Thu, 17 Oct 2013 18:05:06 +0000 (14:05 -0400)
cmake/OpenCVGenPkgconfig.cmake

index ecd7c68..6f93339 100644 (file)
@@ -58,7 +58,13 @@ endforeach()
 set(OpenCV_LIB_COMPONENTS ${OpenCV_LIB_COMPONENTS_})
 if(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()
 endif()