From df988075c73616c007e3e02e8cca9e9bbc681985 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Thu, 19 Feb 2015 19:01:13 +1100 Subject: Fix case sensitive FS issue and update Linux README --- cmake/FindLibusb.cmake | 36 ------------------------------------ cmake/Findlibusb.cmake | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 cmake/FindLibusb.cmake create mode 100644 cmake/Findlibusb.cmake (limited to 'cmake') diff --git a/cmake/FindLibusb.cmake b/cmake/FindLibusb.cmake deleted file mode 100644 index 4b099d3..0000000 --- a/cmake/FindLibusb.cmake +++ /dev/null @@ -1,36 +0,0 @@ -find_path(LIBUSB_INCLUDE_DIR - NAMES - libusb.h - PATHS - /usr/local/include - /opt/local/include - /usr/include - PATH_SUFFIXES - libusb-1.0 -) - -if (libusb_USE_STATIC_LIBS AND NOT MSVC) - set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefox passed to find_library") - set (LIBUSB_LIB_SUFFIX ".a" CACHE INTERNAL "libusb library name suffix passed to find_library") -else (libusb_USE_STATIC_LIBS AND NOT MSVC) - set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefox passed to find_library") - set (LIBUSB_LIB_SUFFIX "" CACHE INTERNAL "libusb library name suffix passed to find_library") -endif (libusb_USE_STATIC_LIBS AND NOT MSVC) - -find_library(LIBUSB_LIBRARY - NAMES - ${LIBUSB_LIB_PREFIX}usb-1.0${LIBUSB_LIB_SUFFIX} ${LIBUSB_LIB_PREFIX}usb${LIBUSB_LIB_SUFFIX} - PATHS - /usr/local/lib - /opt/local/lib - /usr/lib -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LIBUSB REQUIRED_VARS LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR) - -if (LIBUSB_FOUND) - set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR}) - set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY}) - mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARY) -endif (LIBUSB_FOUND) diff --git a/cmake/Findlibusb.cmake b/cmake/Findlibusb.cmake new file mode 100644 index 0000000..4b099d3 --- /dev/null +++ b/cmake/Findlibusb.cmake @@ -0,0 +1,36 @@ +find_path(LIBUSB_INCLUDE_DIR + NAMES + libusb.h + PATHS + /usr/local/include + /opt/local/include + /usr/include + PATH_SUFFIXES + libusb-1.0 +) + +if (libusb_USE_STATIC_LIBS AND NOT MSVC) + set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefox passed to find_library") + set (LIBUSB_LIB_SUFFIX ".a" CACHE INTERNAL "libusb library name suffix passed to find_library") +else (libusb_USE_STATIC_LIBS AND NOT MSVC) + set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefox passed to find_library") + set (LIBUSB_LIB_SUFFIX "" CACHE INTERNAL "libusb library name suffix passed to find_library") +endif (libusb_USE_STATIC_LIBS AND NOT MSVC) + +find_library(LIBUSB_LIBRARY + NAMES + ${LIBUSB_LIB_PREFIX}usb-1.0${LIBUSB_LIB_SUFFIX} ${LIBUSB_LIB_PREFIX}usb${LIBUSB_LIB_SUFFIX} + PATHS + /usr/local/lib + /opt/local/lib + /usr/lib +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LIBUSB REQUIRED_VARS LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR) + +if (LIBUSB_FOUND) + set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR}) + set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY}) + mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARY) +endif (LIBUSB_FOUND) -- cgit v1.1