From 1097fd7aba08d6cc2e34b708922cee0008a94089 Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Sat, 12 May 2012 22:43:21 +0200 Subject: [PATCH] cleanup cmake files, remove libusb module --- CMakeLists.txt | 11 ----------- cmake/Modules/FindLibUSB.cmake | 28 ---------------------------- 2 files changed, 39 deletions(-) delete mode 100644 cmake/Modules/FindLibUSB.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index c5a34cc..a409860 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,6 @@ find_package(GnuradioCore) find_package(GnuradioAudio) find_package(GnuradioUHD) find_package(GnuradioFCD) -#find_package(LibUSB) find_package(LibRTLSDR) if(NOT GRUEL_FOUND) @@ -122,14 +121,6 @@ if(NOT GNURADIO_CORE_FOUND) message(FATAL_ERROR "GnuRadio Core required to compile osmosdr") endif() -if(NOT GNURADIO_AUDIO_FOUND) - message(FATAL_ERROR "GnuRadio Audio required to compile osmosdr") -endif() - -#if(NOT LIBUSB_FOUND) -# message(FATAL_ERROR "LibUSB 1.0 required to compile osmosdr") -#endif() - ######################################################################## # Setup the include and linker paths ######################################################################## @@ -139,14 +130,12 @@ include_directories( ${Boost_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${GNURADIO_CORE_INCLUDE_DIRS} -# ${LIBUSB_INCLUDE_DIR} ) link_directories( ${Boost_LIBRARY_DIRS} ${GRUEL_LIBRARY_DIRS} ${GNURADIO_CORE_LIBRARY_DIRS} -# ${LIBUSB_LIBRARY_DIRS} ) # Set component parameters diff --git a/cmake/Modules/FindLibUSB.cmake b/cmake/Modules/FindLibUSB.cmake deleted file mode 100644 index 97f3db6..0000000 --- a/cmake/Modules/FindLibUSB.cmake +++ /dev/null @@ -1,28 +0,0 @@ -if(NOT LIBUSB_FOUND) - pkg_check_modules (LIBUSB_PKG libusb-1.0) - find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h - PATHS - ${LIBUSB_PKG_INCLUDE_DIRS} - /usr/include/libusb-1.0 - /usr/include - /usr/local/include - ) - - find_library(LIBUSB_LIBRARIES NAMES usb-1.0 - PATHS - ${LIBUSB_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib - ) - -if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found") - message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}") -else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found") - message(STATUS "libusb-1.0 not found.") -endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - -mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) - -endif(NOT LIBUSB_FOUND)