libftdi Archives

Subject: [PATCH 1/1] cmake: fix FindUSB1.cmake

From: Fabrice Fontaine <fontaine.fabrice@xxxxxxxxx>
To: libftdi@xxxxxxxxxxxxxxxxxxxxxxx
Cc: Fabrice Fontaine <fontaine.fabrice@xxxxxxxxx>, Samuel Martin <s.martin49@xxxxxxxxx>
Date: Tue, 1 Oct 2019 18:54:44 +0200
Make sure all ldflags are correctly set, especially for static build.

Signed-off-by: Samuel Martin <s.martin49@xxxxxxxxx>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@xxxxxxxxx>
---
 cmake/FindUSB1.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake
index b90e297..e7f1b3c 100644
--- a/cmake/FindUSB1.cmake
+++ b/cmake/FindUSB1.cmake
@@ -26,8 +26,12 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
     PATH_SUFFIXES libusb-1.0
     PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
 
-  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
-    PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
+  set(LIBUSB_LIBRARIES ${PC_LIBUSB_STATIC_LDFLAGS} 
${PC_LIBUSB_STATIC_LDFLAGS_OTHER})
+  foreach(libname ${PC_LIBUSB_STATIC_LIBRARIES})
+    FIND_LIBRARY(lib NAMES ${libname}
+      PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
+    list(APPEND LIBUSB_LIBRARIES ${lib})
+  endforeach()
 
   include(FindPackageHandleStandardArgs)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES 
LIBUSB_INCLUDE_DIR)
-- 
2.23.0


--
libftdi - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx   

Current Thread