From ea213bf6cc6c913d8f1cc586823932e67b156b51 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 10 Nov 2020 06:18:36 +0100 Subject: [PATCH] Do not include sigmffilerecord if libsigmf is not available --- cmake/Modules/FindLibSigMF.cmake | 2 +- sdrbase/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/FindLibSigMF.cmake b/cmake/Modules/FindLibSigMF.cmake index 9db6f4855..a00943401 100644 --- a/cmake/Modules/FindLibSigMF.cmake +++ b/cmake/Modules/FindLibSigMF.cmake @@ -27,7 +27,7 @@ if (NOT LIBSIGMF_FOUND) set(LIBSIGMF_FOUND TRUE CACHE INTERNAL "libsigmf found") message(STATUS "Found libsigmf: ${LIBSIGMF_INCLUDE_DIR}, ${LIBSIGMF_LIBRARIES}") else (LIBSIGMF_INCLUDE_DIR AND LIBSIGMF_LIBRARIES) - set(LIBSIGMF_FOUND FALSE CACHE INTERNAL "libdsdcc found") + set(LIBSIGMF_FOUND FALSE CACHE INTERNAL "libsigmf found") message(STATUS "libsigmf not found.") endif (LIBSIGMF_INCLUDE_DIR AND LIBSIGMF_LIBRARIES) diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index 329bc2386..7bb01db34 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -51,6 +51,7 @@ if (LIBSIGMF_FOUND) ) set(sdrbase_HEADERS ${sdrbase_HEADERS} + dsp/sigmf_forward.h dsp/sigmffilerecord.h ) include_directories(${LIBSIGMF_INCLUDE_DIR}) @@ -136,7 +137,6 @@ set(sdrbase_SOURCES dsp/samplesimplefifo.cpp dsp/samplesourcefifo.cpp dsp/samplesourcefifodb.cpp - dsp/sigmffilerecord.cpp dsp/basebandsamplesink.cpp dsp/basebandsamplesource.cpp dsp/nullsink.cpp @@ -305,8 +305,6 @@ set(sdrbase_HEADERS dsp/samplesimplefifo.h dsp/samplesourcefifo.h dsp/samplesourcefifodb.h - dsp/sigmf_forward.h - dsp/sigmffilerecord.h dsp/basebandsamplesink.h dsp/basebandsamplesource.h dsp/nullsink.h