Merge branch 'master' of https://github.com/jtdx-project/jtdx-devel

Author: Arvo Järve

CMake/Modules/FindHamlib.cmake

@@ -0,0 +1,64 @@
+#
+# Find the hamlib library
+#
+# This will define the following variables::
+#
+#  Hamlib_FOUND		- True if the system has the usb library
+#  Hamlib_VERSION	- The verion of the usb library which was found
+#
+# and the following imported targets::
+#
+#  Hamlib::Hamlib	- The hamlib library
+#
+
+include (LibFindMacros)
+
+libfind_pkg_detect (Hamlib hamlib
+  FIND_PATH hamlib/rig.h PATH_SUFFIXES hamlib
+  FIND_LIBRARY hamlib
+  )
+
+libfind_package (Hamlib Usb)
+
+libfind_process (Hamlib)
+
+if (NOT Hamlib_PKGCONF_FOUND)
+  if (WIN32)
+    set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};${Usb_LIBRARY};ws2_32)
+  else ()
+    set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};m;dl)
+  endif ()
+elseif (UNIX AND NOT APPLE)
+  set (Hamlib_LIBRARIES ${Hamlib_PKGCONF_STATIC_LDFLAGS})
+endif ()
+
+# fix up extra link libraries for macOS as target_link_libraries gets
+# it wrong for frameworks
+unset (_next_is_framework)
+unset (_Hamlib_EXTRA_LIBS)
+foreach (_lib IN LISTS Hamlib_LIBRARIES Hamlib_PKGCONF_LDFLAGS)
+  if (_next_is_framework)
+    list (APPEND _Hamlib_EXTRA_LIBS "-framework ${_lib}")
+    unset (_next_is_framework)
+  elseif (${_lib} STREQUAL "-framework")
+    set (_next_is_framework TRUE)
+  else ()
+    list (APPEND _Hamlib_EXTRA_LIBS ${_lib})
+  endif ()
+endforeach ()
+
+if (Hamlib_FOUND AND NOT TARGET Hamlib::Hamlib)
+  add_library (Hamlib::Hamlib UNKNOWN IMPORTED)
+  set_target_properties (Hamlib::Hamlib PROPERTIES
+    IMPORTED_LOCATION "${Hamlib_LIBRARY}"
+    INTERFACE_COMPILE_OPTIONS "${Hamlib_PKGCONF_STATIC_OTHER}"
+    INTERFACE_INCLUDE_DIRECTORIES "${Hamlib_INCLUDE_DIR}"
+    INTERFACE_LINK_LIBRARIES "${_Hamlib_EXTRA_LIBS}"
+    )
+endif ()
+
+mark_as_advanced (
+  Hamlib_INCLUDE_DIR
+  Hamlib_LIBRARY
+  Hamlib_LIBRARIES
+  )

CMake/Modules/FindUsb.cmake

@@ -0,0 +1,49 @@
+# Findlibusb
+# ==========
+#
+# Find the usb library
+#
+# This will define the following variables::
+#
+#  Usb_FOUND	- True if the system has the usb library
+#  Usb_VERSION	- The verion of the usb library which was found
+#
+# and the following imported targets::
+#
+#  Usb::Usb	- The libusb library
+#
+
+include (LibFindMacros)
+
+if (WIN32)
+  # Use path suffixes on MS Windows as we probably shouldn't
+  # trust the PATH envvar. PATH will still be searched to find the
+  # library as last resort.
+  if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+    set (_library_options PATH_SUFFIXES MinGW64/dll MinGW64/static)
+  else ()
+    set (_library_options PATH_SUFFIXES MinGW32/dll MinGW32/static)
+  endif ()
+endif ()
+libfind_pkg_detect (Usb usb-1.0
+  FIND_PATH libusb.h PATH_SUFFIXES libusb-1.0
+  FIND_LIBRARY usb-1.0 ${_library_options}
+  )
+
+libfind_process (Usb)
+
+if (Usb_FOUND AND NOT TARGET Usb::Usb)
+  add_library (Usb::Usb UNKNOWN IMPORTED)
+  set_target_properties (Usb::Usb PROPERTIES
+    IMPORTED_LOCATION "${Usb_LIBRARY}"
+    INTERFACE_COMPILE_OPTIONS "${Usb_PKGCONF_CFLAGS_OTHER}"
+    INTERFACE_INCLUDE_DIRECTORIES "${Usb_INCLUDE_DIRS}"
+    INTERFACE_LINK_LIBRARIES "${Usb_LIBRARIES}"
+    )
+endif ()
+
+mark_as_advanced (
+  Usb_INCLUDE_DIR
+  Usb_LIBRARY
+  Usb_LIBRARIES
+  )

CMake/Modules/Findhamlib.cmake

@@ -340,13 +340,30 @@ function(gp_resolve_item context item exepath dirs resolved_item_var)
   else()
     set(rpaths "")
   endif()
+##  message (STATUS "'${context}' '${item}' '${exepath}' '${dirs}' '${resolved_item_var}' '${rpaths}'")
 
   # Is it already resolved?
   #
   if(IS_ABSOLUTE "${resolved_item}" AND EXISTS "${resolved_item}")
     set(resolved 1)
   endif()
 
+  if(NOT resolved AND APPLE)
+    if(item MATCHES "^@rpath")
+      #
+      # @rpath references are relative to the paths built into the binaries with -rpath
+      # We handle this case like we do for other Unixes
+      #
+      string(REPLACE "@rpath/" "/opt/local/lib/gcc-devel/" norpath_item "${item}")
+      set(resolved_item "${norpath_item}")
+      if(IS_ABSOLUTE "${norpath_item}" AND EXISTS "${resolved_item}")
+        set(resolved 1)
+      else()
+        set(resolved_item "${item}")
+      endif()
+    endif()
+  endif()
+
   if(NOT resolved)
     if(item MATCHES "^@executable_path")
       #