diff --git a/cmake/Modules/FindLZ4.cmake b/cmake/Modules/FindLZ4.cmake
index 51f133840..b40d8bcd2 100644
--- a/cmake/Modules/FindLZ4.cmake
+++ b/cmake/Modules/FindLZ4.cmake
@@ -22,6 +22,14 @@ FIND_LIBRARY(LZ4_LIBRARIES
     /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)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARIES LZ4_INCLUDE_DIRS)
 MARK_AS_ADVANCED(LZ4_LIBRARIES LZ4_INCLUDE_DIRS)
diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt
index df2c62537..ff162b746 100644
--- a/plugins/samplesource/CMakeLists.txt
+++ b/plugins/samplesource/CMakeLists.txt
@@ -50,15 +50,16 @@ else(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
     message(STATUS "LibMiriSDR NOT found")
 endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
 
-#find_package(LibNANOMSG)
-#if(LIBNANOMSG_FOUND)
-#    add_subdirectory(sdrdaemon)    
-#endif(LIBNANOMSG_FOUND)
+find_package(LZ4)
+find_package(LibNANOMSG)
+if(LIBNANOMSG_FOUND AND LIBLZ4_FOUND)
+    add_subdirectory(sdrdaemon)
+endif(LIBNANOMSG_FOUND AND LIBLZ4_FOUND)
 
 find_package(CM256cc)
-if(CM256CC_FOUND)
+if(CM256CC_FOUND AND LIBNANOMSG_FOUND)
     add_subdirectory(sdrdaemonfec)
-endif(CM256CC_FOUND)
+endif(CM256CC_FOUND AND LIBNANOMSG_FOUND)
 
 if (BUILD_DEBIAN)
     add_subdirectory(sdrdaemonfec)
@@ -68,7 +69,5 @@ if (BUILD_DEBIAN)
     add_subdirectory(bladerf)
 endif (BUILD_DEBIAN)
 
-
 add_subdirectory(filesource)
-add_subdirectory(sdrdaemon)