cleanup cmake files, remove libusb module

gr3.6
Dimitri Stolnikov 11 years ago
parent 52dea1e0b7
commit 1097fd7aba
  1. 11
      CMakeLists.txt
  2. 28
      cmake/Modules/FindLibUSB.cmake

@ -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

@ -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)
Loading…
Cancel
Save