From 112af1ea136d41184e8b2db39a42078087ea274f Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 12 Jan 2020 10:34:22 +0100 Subject: [PATCH] LimeRFE USB support: simplify LimeRFE support switch --- CMakeLists.txt | 2 +- sdrgui/mainwindow.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fd270541..1f63cbf0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,7 +383,7 @@ if(ENABLE_HACKRF) endif() if(ENABLE_LIMESUITE) find_package(LimeSuite) - if (LIMERFE_FOUND) + if (NOT APPLE AND LIMERFE_FOUND) add_definitions(-DHAS_LIMERFE) endif() endif() diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 34cc6595b..7fa68e66a 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -80,7 +80,7 @@ #include #include -#if defined(HAS_LIMERFE) and not defined(__APPLE__) +#if defined(HAS_LIMERFE) #include "limerfegui/limerfeusbdialog.h" #endif @@ -250,7 +250,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse #ifdef __APPLE__ ui->menuPreferences->removeAction(ui->action_AMBE); #endif -#if not defined(HAS_LIMERFE) or defined(__APPLE__) +#if not defined(HAS_LIMERFE) ui->menuPreferences->removeAction(ui->action_LimeRFE); #endif @@ -1705,7 +1705,7 @@ void MainWindow::on_action_AMBE_triggered() void MainWindow::on_action_LimeRFE_triggered() { qDebug("MainWindow::on_action_LimeRFE_triggered"); -#if defined(HAS_LIMERFE) and not defined(__APPLE__) +#if defined(HAS_LIMERFE) qDebug("MainWindow::on_action_LimeRFE_triggered: activated"); LimeRFEUSBDialog *limeRFEUSBDialog = new LimeRFEUSBDialog(this); limeRFEUSBDialog->setModal(false);