VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-31 04:50:29 -04:00
Code Issues Projects Releases Wiki Activity

Fixed SDRdaemon and SDRdaemonFEC builds so that they are included only if dependent libraries are found. This fixes issue #9

Browse Source
This commit is contained in:
f4exb 2016-11-21 17:48:30 +01:00
parent 60925ea84b
commit 7c8efb046c
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/Modules/FindLZ4.cmake
View File

@ -22,6 +22,14 @@ FIND_LIBRARY(LZ4_LIBRARIES
/usr/lib /usr/lib
) )
if (LZ4_LIBRARIES AND LZ4_INCLUDE_DIRS)
set(LIBLZ4_FOUND TRUE CACHE INTERNAL "liblz4 found")
message(STATUS "Found liblz4: ${LZ4_INCLUDE_DIRS}, ${LZ4_LIBRARIES}")
else (LZ4_LIBRARIES AND LZ4_INCLUDE_DIRS)
set(LIBLZ4_FOUND FALSE CACHE INTERNAL "liblz4 found")
message(STATUS "liblz4 not found")
endif (LZ4_LIBRARIES AND LZ4_INCLUDE_DIRS)
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARIES LZ4_INCLUDE_DIRS) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARIES LZ4_INCLUDE_DIRS)
MARK_AS_ADVANCED(LZ4_LIBRARIES LZ4_INCLUDE_DIRS) MARK_AS_ADVANCED(LZ4_LIBRARIES LZ4_INCLUDE_DIRS)

15
plugins/samplesource/CMakeLists.txt
View File

@ -50,15 +50,16 @@ else(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
message(STATUS "LibMiriSDR NOT found") message(STATUS "LibMiriSDR NOT found")
endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND) endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
#find_package(LibNANOMSG) find_package(LZ4)
#if(LIBNANOMSG_FOUND) find_package(LibNANOMSG)
# add_subdirectory(sdrdaemon) if(LIBNANOMSG_FOUND AND LIBLZ4_FOUND)
#endif(LIBNANOMSG_FOUND) add_subdirectory(sdrdaemon)
endif(LIBNANOMSG_FOUND AND LIBLZ4_FOUND)
find_package(CM256cc) find_package(CM256cc)
if(CM256CC_FOUND) if(CM256CC_FOUND AND LIBNANOMSG_FOUND)
add_subdirectory(sdrdaemonfec) add_subdirectory(sdrdaemonfec)
endif(CM256CC_FOUND) endif(CM256CC_FOUND AND LIBNANOMSG_FOUND)
if (BUILD_DEBIAN) if (BUILD_DEBIAN)
add_subdirectory(sdrdaemonfec) add_subdirectory(sdrdaemonfec)
@ -68,7 +69,5 @@ if (BUILD_DEBIAN)
add_subdirectory(bladerf) add_subdirectory(bladerf)
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
add_subdirectory(filesource) add_subdirectory(filesource)
add_subdirectory(sdrdaemon)