libusb: Improve test program and fix linking on macOS

Author: hjmallon

cmake/modules/hunter_pkgconfig_export_target.cmake

@@ -16,7 +16,7 @@ include(hunter_status_debug)
 # * x11
 # * x264
 # * xcb
-function(hunter_pkgconfig_export_target PKG_CONFIG_MODULE)
+function(hunter_pkgconfig_export_target PKG_CONFIG_MODULE PKG_GENERATE_SHARED)
   set(target_name "PkgConfig::${PKG_CONFIG_MODULE}")
   if(TARGET "${target_name}")
     return()
@@ -29,15 +29,25 @@ function(hunter_pkgconfig_export_target PKG_CONFIG_MODULE)
   endif()
   add_library("${target_name}" INTERFACE IMPORTED GLOBAL)
 
+  if(${PKG_GENERATE_SHARED})
+    set(PKG_CONFIG_PREFIX "${PKG_CONFIG_MODULE}")
+  else()
+    set(PKG_CONFIG_PREFIX "${PKG_CONFIG_MODULE}_STATIC")
+  endif()
+
+  hunter_status_debug(
+    "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} Using prefix ${PKG_CONFIG_PREFIX}"
+  )
+
   # --- INTERFACE_INCLUDE_DIRECTORIES begin ---
   hunter_status_debug(
-      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} INCLUDE_DIRS: ${${PKG_CONFIG_MODULE}_INCLUDE_DIRS}"
+      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} INCLUDE_DIRS: ${${PKG_CONFIG_PREFIX}_INCLUDE_DIRS}"
   )
-  if(NOT "${${PKG_CONFIG_MODULE}_INCLUDE_DIRS}" STREQUAL "")
+  if(NOT "${${PKG_CONFIG_PREFIX}_INCLUDE_DIRS}" STREQUAL "")
     set_target_properties("${target_name}"
         PROPERTIES
           INTERFACE_INCLUDE_DIRECTORIES
-          "${${PKG_CONFIG_MODULE}_INCLUDE_DIRS}"
+          "${${PKG_CONFIG_PREFIX}_INCLUDE_DIRS}"
     )
   endif()
   # --- INTERFACE_INCLUDE_DIRECTORIES end ---
@@ -46,18 +56,18 @@ function(hunter_pkgconfig_export_target PKG_CONFIG_MODULE)
   set(link_libs)
 
   hunter_status_debug(
-      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} LDFLAGS: ${${PKG_CONFIG_MODULE}_LDFLAGS}"
+      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} LDFLAGS: ${${PKG_CONFIG_PREFIX}_LDFLAGS}"
   )
-  if(NOT "${${PKG_CONFIG_MODULE}_LDFLAGS}" STREQUAL "")
-    list(APPEND link_libs ${${PKG_CONFIG_MODULE}_LDFLAGS})
+  if(NOT "${${PKG_CONFIG_PREFIX}_LDFLAGS}" STREQUAL "")
+    list(APPEND link_libs ${${PKG_CONFIG_PREFIX}_LDFLAGS})
   endif()
 
   hunter_status_debug(
-      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} LDFLAGS_OTHER: ${${PKG_CONFIG_MODULE}_LDFLAGS_OTHER}"
+      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} LDFLAGS_OTHER: ${${PKG_CONFIG_PREFIX}_LDFLAGS_OTHER}"
   )
-  if(NOT "${${PKG_CONFIG_MODULE}_LDFLAGS_OTHER}" STREQUAL "")
+  if(NOT "${${PKG_CONFIG_PREFIX}_LDFLAGS_OTHER}" STREQUAL "")
     # turn "-framework;A;-framework;B" into "-framework A;-framework B"
-    string(REPLACE "-framework;" "-framework " ldflags_other "${${PKG_CONFIG_MODULE}_LDFLAGS_OTHER}")
+    string(REPLACE "-framework;" "-framework " ldflags_other "${${PKG_CONFIG_PREFIX}_LDFLAGS_OTHER}")
     list(APPEND link_libs ${ldflags_other})
   endif()
 
@@ -76,17 +86,17 @@ function(hunter_pkgconfig_export_target PKG_CONFIG_MODULE)
   set(compile_opts)
 
   hunter_status_debug(
-      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} CFLAGS: ${${PKG_CONFIG_MODULE}_CFLAGS}"
+      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} CFLAGS: ${${PKG_CONFIG_PREFIX}_CFLAGS}"
   )
-  if(NOT "${${PKG_CONFIG_MODULE}_CFLAGS}" STREQUAL "")
-    list(APPEND compile_opts ${${PKG_CONFIG_MODULE}_CFLAGS})
+  if(NOT "${${PKG_CONFIG_PREFIX}_CFLAGS}" STREQUAL "")
+    list(APPEND compile_opts ${${PKG_CONFIG_PREFIX}_CFLAGS})
   endif()
 
   hunter_status_debug(
-      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} CFLAGS_OTHER: ${${PKG_CONFIG_MODULE}_CFLAGS_OTHER}"
+      "PKG_CONFIG_MODULE ${PKG_CONFIG_MODULE} CFLAGS_OTHER: ${${PKG_CONFIG_PREFIX}_CFLAGS_OTHER}"
   )
-  if(NOT "${${PKG_CONFIG_MODULE}_CFLAGS_OTHER}" STREQUAL "")
-    list(APPEND compile_opts ${${PKG_CONFIG_MODULE}_CFLAGS_OTHER})
+  if(NOT "${${PKG_CONFIG_PREFIX}_CFLAGS_OTHER}" STREQUAL "")
+    list(APPEND compile_opts ${${PKG_CONFIG_PREFIX}_CFLAGS_OTHER})
   endif()
 
   if(NOT "${compile_opts}" STREQUAL "")
@@ -98,4 +108,3 @@ function(hunter_pkgconfig_export_target PKG_CONFIG_MODULE)
   endif()
   # --- INTERFACE_COMPILE_OPTIONS end ---
 endfunction()
-

cmake/projects/libusb/hunter.cmake

@@ -31,7 +31,7 @@ hunter_configuration_types(libusb CONFIGURATION_TYPES Release)
 hunter_pick_scheme(DEFAULT url_sha1_autogen_autotools)
 hunter_cacheable(libusb)
 hunter_download(PACKAGE_NAME libusb
-    PACKAGE_INTERNAL_DEPS_ID "1"
+    PACKAGE_INTERNAL_DEPS_ID "2"
     PACKAGE_UNRELOCATABLE_TEXT_FILES
     lib/pkgconfig/libusb-1.0.pc
 )

cmake/projects/tcl/schemes/url_sha1_tcl_autotools.cmake.in

@@ -89,9 +89,12 @@ if(NOT default_pkgconfig)
   set(DEPENDS_ON_PACKAGES ${DEPENDS_ON_PKGCONFIGS})
 endif()
 
+set(PKG_GENERATE_SHARED "${BUILD_SHARED_LIBS}")
+
 foreach(PKG_CONFIG_MODULE ${PKGCONFIG_EXPORT_TARGETS})
   # Use:
   # * DEPENDS_ON_PACKAGES
+  # * PKG_GENERATE_SHARED
   configure_file(
       "@HUNTER_GLOBAL_SCRIPT_DIR@/pkgconfig-export-targets.cmake.in"
       "@HUNTER_PACKAGE_INSTALL_PREFIX@/lib/cmake/${PKG_CONFIG_MODULE}/${PKG_CONFIG_MODULE}Config.cmake"

cmake/projects/x264/schemes/url_sha1_x264.cmake.in

@@ -341,6 +341,8 @@ else()
   )
 endif()
 
+set(PKG_GENERATE_SHARED "${BUILD_SHARED_LIBS}")
+
 foreach(PKG_CONFIG_MODULE ${PKGCONFIG_EXPORT_TARGETS})
   configure_file(
       "@HUNTER_GLOBAL_SCRIPT_DIR@/pkgconfig-export-targets.cmake.in"

cmake/projects/xcb/schemes/xcb.cmake.in

@@ -69,9 +69,12 @@ hunter_autotools_project(
 
 set(PKG_CONFIG_MODULE xcb)
 
+set(PKG_GENERATE_SHARED "${BUILD_SHARED_LIBS}")
+
 # Use:
 # * PKG_CONFIG_MODULE
 # * DEPENDS_ON_PACKAGES
+# * PKG_GENERATE_SHARED
 configure_file(
     "@HUNTER_GLOBAL_SCRIPT_DIR@/pkgconfig-export-targets.cmake.in"
     "@HUNTER_PACKAGE_INSTALL_PREFIX@/lib/cmake/${PKG_CONFIG_MODULE}/${PKG_CONFIG_MODULE}Config.cmake"

cmake/schemes/url_sha1_autogen_autotools.cmake.in

@@ -62,9 +62,12 @@ if(NOT default_pkgconfig)
   set(DEPENDS_ON_PACKAGES ${DEPENDS_ON_PKGCONFIGS})
 endif()
 
+set(PKG_GENERATE_SHARED "${BUILD_SHARED_LIBS}")
+
 foreach(PKG_CONFIG_MODULE ${PKGCONFIG_EXPORT_TARGETS})
   # Use:
   # * DEPENDS_ON_PACKAGES
+  # * PKG_GENERATE_SHARED
   configure_file(
       "@HUNTER_GLOBAL_SCRIPT_DIR@/pkgconfig-export-targets.cmake.in"
       "@HUNTER_PACKAGE_INSTALL_PREFIX@/lib/cmake/${PKG_CONFIG_MODULE}/${PKG_CONFIG_MODULE}Config.cmake"

cmake/schemes/url_sha1_autotools.cmake.in

@@ -64,9 +64,12 @@ if(NOT default_pkgconfig)
   set(DEPENDS_ON_PACKAGES ${DEPENDS_ON_PKGCONFIGS})
 endif()
 
+set(PKG_GENERATE_SHARED "${BUILD_SHARED_LIBS}")
+
 foreach(PKG_CONFIG_MODULE ${PKGCONFIG_EXPORT_TARGETS})
   # Use:
   # * DEPENDS_ON_PACKAGES
+  # * PKG_GENERATE_SHARED
   configure_file(
       "@HUNTER_GLOBAL_SCRIPT_DIR@/pkgconfig-export-targets.cmake.in"
       "@HUNTER_PACKAGE_INSTALL_PREFIX@/lib/cmake/${PKG_CONFIG_MODULE}/${PKG_CONFIG_MODULE}Config.cmake"

examples/libusb/boo.cpp

@@ -1,4 +1,20 @@
 #include <libusb.h>
 
 int main() {
+    libusb_device **devs;
+    int r;
+    ssize_t cnt;
+
+    r = libusb_init(NULL);
+    if (r < 0)
+        return r;
+
+    cnt = libusb_get_device_list(NULL, &devs);
+    if (cnt < 0)
+        return (int) cnt;
+
+    libusb_free_device_list(devs, 1);
+
+    libusb_exit(NULL);
+    return 0;
 }

scripts/pkgconfig-export-targets.cmake.in

@@ -7,7 +7,7 @@
 
 include(hunter_pkgconfig_export_target)
 
-hunter_pkgconfig_export_target("@PKG_CONFIG_MODULE@")
+hunter_pkgconfig_export_target("@PKG_CONFIG_MODULE@" "@PKG_GENERATE_SHARED@")
 
 foreach(_hunter_deps @DEPENDS_ON_PACKAGES@)
   find_package("${_hunter_deps}" CONFIG REQUIRED)