From 01591a0bd7f61be06497957cad09be9d768337b3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 8 May 2017 18:30:52 +0200 Subject: [PATCH] cmake files adjustment --- cmake/Modules/FindLimeSuite.cmake | 34 +++++++++++++++++-------------- devices/CMakeLists.txt | 30 +++++++++++++-------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/cmake/Modules/FindLimeSuite.cmake b/cmake/Modules/FindLimeSuite.cmake index 02a7f5121..49df1ae0e 100644 --- a/cmake/Modules/FindLimeSuite.cmake +++ b/cmake/Modules/FindLimeSuite.cmake @@ -1,21 +1,25 @@ # Find Lime Suite -FIND_PATH (LIMESUITE_INCLUDE_DIR - NAMES lime/LimeSuite.h - PATHS - /usr/include - /usr/local/include -) +if (!LIMESUITE_INCLUDE_DIR) + FIND_PATH (LIMESUITE_INCLUDE_DIR + NAMES lime/LimeSuite.h + PATHS + /usr/include + /usr/local/include + ) +endif() -FIND_LIBRARY (LIMESUITE_LIBRARY - NAMES LimeSuite - HINTS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - PATHS /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 -) +if (!LIMESUITE_LIBRARY) + FIND_LIBRARY (LIMESUITE_LIBRARY + NAMES LimeSuite + HINTS ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 + PATHS /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 + ) +endif() IF (LIMESUITE_INCLUDE_DIR AND LIMESUITE_LIBRARY) SET(LIMESUITE_FOUND TRUE) diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt index d8d8ea1f5..0a0e7bd02 100644 --- a/devices/CMakeLists.txt +++ b/devices/CMakeLists.txt @@ -2,23 +2,23 @@ project(devices) find_package(LibUSB) -find_package(LibBLADERF) -if(LIBUSB_FOUND AND LIBBLADERF_FOUND) - add_subdirectory(bladerf) -endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) - -find_package(LibHACKRF) -if(LIBUSB_FOUND AND LIBHACKRF_FOUND) - add_subdirectory(hackrf) -endif(LIBUSB_FOUND AND LIBHACKRF_FOUND) - -find_package(LimeSuite) -if(LIBUSB_FOUND AND LIMESUITE_FOUND) - add_subdirectory(limesdr) -endif(LIBUSB_FOUND AND LIMESUITE_FOUND) - if (BUILD_DEBIAN) add_subdirectory(bladerf) add_subdirectory(hackrf) add_subdirectory(limesdr) +else(BUILD_DEBIAN) + find_package(LibBLADERF) + if(LIBUSB_FOUND AND LIBBLADERF_FOUND) + add_subdirectory(bladerf) + endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) + + find_package(LibHACKRF) + if(LIBUSB_FOUND AND LIBHACKRF_FOUND) + add_subdirectory(hackrf) + endif(LIBUSB_FOUND AND LIBHACKRF_FOUND) + + find_package(LimeSuite) + if(LIBUSB_FOUND AND LIMESUITE_FOUND) + add_subdirectory(limesdr) + endif(LIBUSB_FOUND AND LIMESUITE_FOUND) endif (BUILD_DEBIAN)