Added more flexible build options

2020-04-30 15:19:19 +03:00 · 2020-04-30 15:19:19 +03:00 · d9ea8d4abc
commit d9ea8d4abc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -108,6 +108,10 @@ if(NOT DEBUG_OUTPUT)
  add_definitions("-DQT_NO_DEBUG_OUTPUT")
 endif()

+if(ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO")
+  set(AUTO_EXTERNAL_LIBRARIES ON CACHE INTERNAL "")
+endif(ENABLE_EXTERNAL_LIBRARIES)
+
 # declare build structures
 # !! change sdrbase/plugins/pluginmanager.cpp too !!
 set(SDRANGEL_BINARY_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
--- a/cmake/Modules/FindCM256cc.cmake
+++ b/cmake/Modules/FindCM256cc.cmake
@ -1,36 +1,38 @@
-INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(PC_CM256cc "libcm256cc")
+if (NOT CM256CC_FOUND)
+    INCLUDE(FindPkgConfig)
+    PKG_CHECK_MODULES(PC_CM256cc "libcm256cc")

-FIND_PATH(CM256CC_INCLUDE_DIR
-    NAMES cm256cc/cm256.h
-    HINTS ${CM256CC_DIR}/include
-          ${PC_CM256CC_INCLUDE_DIR}
-          ${CMAKE_INSTALL_PREFIX}/include
-    PATHS /usr/local/include
-          /usr/include
-)
+    FIND_PATH(CM256CC_INCLUDE_DIR
+        NAMES cm256cc/cm256.h
+        HINTS ${CM256CC_DIR}/include
+              ${PC_CM256CC_INCLUDE_DIR}
+              ${CMAKE_INSTALL_PREFIX}/include
+        PATHS /usr/local/include
+              /usr/include
+    )

-FIND_LIBRARY(CM256CC_LIBRARIES
-    NAMES cm256cc libcm256cc
-    HINTS ${CM256CC_DIR}/lib
-          ${CM256CC_DIR}/lib64
-          ${PC_CM256CC_LIBDIR}
-          ${CMAKE_INSTALL_PREFIX}/lib
-          ${CMAKE_INSTALL_PREFIX}/lib64
-    PATHS /usr/local/lib
-          /usr/local/lib64
-          /usr/lib
-          /usr/lib64
-)
+    FIND_LIBRARY(CM256CC_LIBRARIES
+        NAMES cm256cc libcm256cc
+        HINTS ${CM256CC_DIR}/lib
+              ${CM256CC_DIR}/lib64
+              ${PC_CM256CC_LIBDIR}
+              ${CMAKE_INSTALL_PREFIX}/lib
+              ${CMAKE_INSTALL_PREFIX}/lib64
+        PATHS /usr/local/lib
+              /usr/local/lib64
+              /usr/lib
+              /usr/lib64
+    )

-if(CM256CC_INCLUDE_DIR AND CM256CC_LIBRARIES)
-    set(CM256CC_FOUND TRUE CACHE INTERNAL "CM256CC found")
-    message(STATUS "Found CM256cc: ${CM256CC_INCLUDE_DIR}, ${CM256CC_LIBRARIES}")
-else(CM256CC_INCLUDE_DIR AND CM256CC_LIBRARIES)
-    set(CM256CC_FOUND FALSE CACHE INTERNAL "CM256CC found")
-    message(STATUS "CM256cc not found")
-endif(CM256CC_INCLUDE_DIR AND CM256CC_LIBRARIES)
+    if(CM256CC_INCLUDE_DIR AND CM256CC_LIBRARIES)
+        set(CM256CC_FOUND TRUE CACHE INTERNAL "CM256CC found")
+        message(STATUS "Found CM256cc: ${CM256CC_INCLUDE_DIR}, ${CM256CC_LIBRARIES}")
+    else(CM256CC_INCLUDE_DIR AND CM256CC_LIBRARIES)
+        set(CM256CC_FOUND FALSE CACHE INTERNAL "CM256CC found")
+        message(STATUS "CM256cc not found")
+    endif(CM256CC_INCLUDE_DIR AND CM256CC_LIBRARIES)

-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CM256CC DEFAULT_MSG CM256CC_LIBRARIES CM256CC_INCLUDE_DIR)
-MARK_AS_ADVANCED(CM256CC_LIBRARIES CM256CC_INCLUDE_DIR)
+    INCLUDE(FindPackageHandleStandardArgs)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(CM256CC DEFAULT_MSG CM256CC_LIBRARIES CM256CC_INCLUDE_DIR)
+    MARK_AS_ADVANCED(CM256CC_LIBRARIES CM256CC_INCLUDE_DIR)
+endif (NOT CM256CC_FOUND)
--- a/cmake/Modules/FindCodec2.cmake
+++ b/cmake/Modules/FindCodec2.cmake
@ -1,36 +1,38 @@
-INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(PC_CODEC2 "codec2")
+if (NOT CODEC2_FOUND)
+    INCLUDE(FindPkgConfig)
+    PKG_CHECK_MODULES(PC_CODEC2 "codec2")

-FIND_PATH(CODEC2_INCLUDE_DIR
-    NAMES codec2/codec2.h
-    HINTS ${CODEC2_DIR}/include
-          ${PC_CODEC2_INCLUDE_DIR}
-          ${CMAKE_INSTALL_PREFIX}/include
-    PATHS /usr/local/include
-          /usr/include
-)
+    FIND_PATH(CODEC2_INCLUDE_DIR
+        NAMES codec2/codec2.h
+        HINTS ${CODEC2_DIR}/include
+              ${PC_CODEC2_INCLUDE_DIR}
+              ${CMAKE_INSTALL_PREFIX}/include
+        PATHS /usr/local/include
+              /usr/include
+    )

-FIND_LIBRARY(CODEC2_LIBRARIES
-    NAMES codec2 libcodec2
-    HINTS ${CODEC2_DIR}/lib
-          ${CODEC2_DIR}/lib64
-          ${PC_CODEC2_LIBDIR}
-          ${CMAKE_INSTALL_PREFIX}/lib
-          ${CMAKE_INSTALL_PREFIX}/lib64
-    PATHS /usr/local/lib
-          /usr/local/lib64
-          /usr/lib
-          /usr/lib64
-)
+    FIND_LIBRARY(CODEC2_LIBRARIES
+        NAMES codec2 libcodec2
+        HINTS ${CODEC2_DIR}/lib
+              ${CODEC2_DIR}/lib64
+              ${PC_CODEC2_LIBDIR}
+              ${CMAKE_INSTALL_PREFIX}/lib
+              ${CMAKE_INSTALL_PREFIX}/lib64
+        PATHS /usr/local/lib
+              /usr/local/lib64
+              /usr/lib
+              /usr/lib64
+    )

-if(CODEC2_INCLUDE_DIR AND CODEC2_LIBRARIES)
-    set(CODEC2_FOUND TRUE CACHE INTERNAL "CODEC2 found")
-    message(STATUS "Found Codec2: ${CODEC2_INCLUDE_DIR}, ${CODEC2_LIBRARIES}")
-else()
-    set(CODEC2_FOUND FALSE CACHE INTERNAL "CODEC2 found")
-    message(STATUS "Codec2 not found")
-endif()
+    if(CODEC2_INCLUDE_DIR AND CODEC2_LIBRARIES)
+        set(CODEC2_FOUND TRUE CACHE INTERNAL "CODEC2 found")
+        message(STATUS "Found Codec2: ${CODEC2_INCLUDE_DIR}, ${CODEC2_LIBRARIES}")
+    else()
+        set(CODEC2_FOUND FALSE CACHE INTERNAL "CODEC2 found")
+        message(STATUS "Codec2 not found")
+    endif()

-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CODEC2 DEFAULT_MSG CODEC2_LIBRARIES CODEC2_INCLUDE_DIR)
-MARK_AS_ADVANCED(CODEC2_LIBRARIES CODEC2_INCLUDE_DIR)
+    INCLUDE(FindPackageHandleStandardArgs)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(CODEC2 DEFAULT_MSG CODEC2_LIBRARIES CODEC2_INCLUDE_DIR)
+    MARK_AS_ADVANCED(CODEC2_LIBRARIES CODEC2_INCLUDE_DIR)
+endif (NOT CODEC2_FOUND)
--- a/cmake/Modules/FindLibMbe.cmake
+++ b/cmake/Modules/FindLibMbe.cmake
@ -1,33 +1,34 @@
 # Find libmbe
+if (NOT LIBMBE_FOUND)
+    find_path(LIBMBE_INCLUDE_DIR
+            NAMES mbelib.h
+            HINTS ${MBE_DIR}/include
+            PATHS /usr/include
+            /usr/local/include
+            )

-find_path(LIBMBE_INCLUDE_DIR
-  NAMES mbelib.h
-  HINTS ${MBE_DIR}/include
-  PATHS /usr/include
-        /usr/local/include
-)
+    set(LIBMBE_NAMES ${LIBMBE_NAMES} mbe libmbe)

-set(LIBMBE_NAMES ${LIBMBE_NAMES} mbe libmbe)
+    find_library(LIBMBE_LIBRARIES
+            NAMES ${LIBMBE_NAMES}
+            HINTS ${MBE_DIR}/lib
+            PATHS /usr/lib
+            /usr/local/lib
+            )

-find_library(LIBMBE_LIBRARY
-  NAMES ${LIBMBE_NAMES}
-  HINTS ${MBE_DIR}/lib
-  PATHS /usr/include
-        /usr/local/include
-)
+    if (LIBMBE_INCLUDE_DIR AND LIBMBE_LIBRARIES)
+        set(LIBMBE_FOUND TRUE CACHE INTERNAL "libmbe found")

-if (LIBMBE_INCLUDE_DIR AND LIBMBE_LIBRARY)
-    set(LIBMBE_FOUND TRUE)
-endif (LIBMBE_INCLUDE_DIR AND LIBMBE_LIBRARY)
+        if (NOT LibMbe_FIND_QUIETLY)
+            message(STATUS "Found LibMbe: ${LIBMBE_INCLUDE_DIR}, ${LIBMBE_LIBRARY}")
+        endif (NOT LibMbe_FIND_QUIETLY)
+    else (LIBMBE_INCLUDE_DIR AND LIBMBE_LIBRARIES)
+        set(LIBMBE_FOUND FALSE CACHE INTERNAL "libmbe found")

-if (LIBMBE_FOUND)
-    if (NOT LibMbe_FIND_QUIETLY)
-        message (STATUS "Found LibMbe: ${LIBMBE_INCLUDE_DIR}, ${LIBMBE_LIBRARY}")
-    endif (NOT LibMbe_FIND_QUIETLY)
-else (LIBMBE_FOUND)
-    if (LibMbe_FIND_REQUIRED)
-        message (FATAL_ERROR "Could not find mbe")
-    endif (LibMbe_FIND_REQUIRED)
-endif (LIBMBE_FOUND)
+        if (LibMbe_FIND_REQUIRED)
+            message(FATAL_ERROR "Could not find LibMbe")
+        endif (LibMbe_FIND_REQUIRED)
+    endif (LIBMBE_INCLUDE_DIR AND LIBMBE_LIBRARIES)

-mark_as_advanced(LIBMBE_INCLUDE_DIR LIBMBE_LIBRARY)
+    mark_as_advanced(LIBMBE_INCLUDE_DIR LIBMBE_LIBRARIES)
+endif (NOT LIBMBE_FOUND)
--- a/cmake/Modules/FindLimeSuite.cmake
+++ b/cmake/Modules/FindLimeSuite.cmake
@ -1,35 +1,34 @@
 # Find Lime Suite
+if (NOT LIMESUITE_FOUND)
+    if (NOT LIMESUITE_INCLUDE_DIR)
+        find_path (LIMESUITE_INCLUDE_DIR
+            NAMES lime/LimeSuite.h
+            HINTS ${LIMESUITE_DIR}/include
+            PATHS /usr/include
+                  /usr/local/include
+        )
+    endif()

-if (NOT LIMESUITE_INCLUDE_DIR)
-    find_path (LIMESUITE_INCLUDE_DIR
-        NAMES lime/LimeSuite.h
-        HINTS ${LIMESUITE_DIR}/include
-        PATHS /usr/include
-              /usr/local/include
-    )
-endif()
+    if (NOT LIMESUITE_LIBRARY)
+        find_library (LIMESUITE_LIBRARY
+            NAMES LimeSuite
+            HINTS ${LIMESUITE_DIR}/lib
+                  ${CMAKE_INSTALL_PREFIX}/lib
+                  ${CMAKE_INSTALL_PREFIX}/lib64
+            PATHS /usr/local/lib
+                  /usr/local/lib64
+                  /usr/lib
+                  /usr/lib64
+        )
+    endif()

-if (NOT LIMESUITE_LIBRARY)
-    find_library (LIMESUITE_LIBRARY
-        NAMES LimeSuite
-        HINTS ${LIMESUITE_DIR}/lib
-              ${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 CACHE INTERNAL "")
+        message (STATUS "Found Lime Suite: ${LIMESUITE_INCLUDE_DIR}, ${LIMESUITE_LIBRARY}")
+    else (LIMESUITE_INCLUDE_DIR AND LIMESUITE_LIBRARY)
+        set(LIMESUITE_FOUND FALSE CACHE INTERNAL "")
+        message (STATUS "Could not find Lime Suite")
+    endif (LIMESUITE_INCLUDE_DIR AND LIMESUITE_LIBRARY)

-if (LIMESUITE_INCLUDE_DIR AND LIMESUITE_LIBRARY)
-    set(LIMESUITE_FOUND TRUE)
-endif (LIMESUITE_INCLUDE_DIR AND LIMESUITE_LIBRARY)
-
-if (LIMESUITE_FOUND)
-    message (STATUS "Found Lime Suite: ${LIMESUITE_INCLUDE_DIR}, ${LIMESUITE_LIBRARY}")
-else (LIMESUITE_FOUND)
-    message (STATUS "Could not find Lime Suite")
-endif (LIMESUITE_FOUND)
-
-mark_as_advanced(LIMESUITE_INCLUDE_DIR LIMESUITE_LIBRARY)
+    mark_as_advanced(LIMESUITE_INCLUDE_DIR LIMESUITE_LIBRARY)
+endif (NOT LIMESUITE_FOUND)
--- a/cmake/Modules/FindSerialDV.cmake
+++ b/cmake/Modules/FindSerialDV.cmake
@ -1,33 +1,34 @@
 # Find serialDV
+if (NOT LIBSERIALDV_FOUND)
+    find_path(LIBSERIALDV_INCLUDE_DIR
+      NAMES dvcontroller.h
+      HINTS ${SERIALDV_DIR}/include/serialdv
+      PATHS /usr/include/serialdv
+            /usr/local/include/serialdv
+    )

-find_path(LIBSERIALDV_INCLUDE_DIR
-  NAMES dvcontroller.h
-  HINTS ${SERIALDV_DIR}/include/serialdv
-  PATHS /usr/include/serialdv
-        /usr/local/include/serialdv
-)
+    set(LIBSERIAL_NAMES ${LIBSERIAL_NAMES} serialdv libserialdv)

-set(LIBSERIAL_NAMES ${LIBSERIAL_NAMES} serialdv libserialdv)
+    find_library(LIBSERIALDV_LIBRARY
+      NAMES serialdv
+      HINTS ${SERIALDV_DIR}/lib
+      PATHS /usr/lib
+            /usr/local/lib
+    )

-find_library(LIBSERIALDV_LIBRARY
-  NAMES serialdv
-  HINTS ${SERIALDV_DIR}/lib
-  PATHS /usr/lib
-        /usr/local/lib
-)
+    if (LIBSERIALDV_INCLUDE_DIR AND LIBSERIALDV_LIBRARY)
+        set(LIBSERIALDV_FOUND TRUE CACHE INTERNAL "")

-if (LIBSERIALDV_INCLUDE_DIR AND LIBSERIALDV_LIBRARY)
-    set(LIBSERIALDV_FOUND TRUE)
-endif (LIBSERIALDV_INCLUDE_DIR AND LIBSERIALDV_LIBRARY)
+        if (NOT SerialDV_FIND_QUIETLY)
+            message (STATUS "Found libserialdv: ${LIBSERIALDV_INCLUDE_DIR}, ${LIBSERIALDV_LIBRARY}")
+        endif (NOT SerialDV_FIND_QUIETLY)
+    else (LIBSERIALDV_INCLUDE_DIR AND LIBSERIALDV_LIBRARY)
+        set(LIBSERIALDV_FOUND FALSE CACHE INTERNAL "")

-if (LIBSERIALDV_FOUND)
-    if (NOT SerialDV_FIND_QUIETLY)
-        message (STATUS "Found libserialdv: ${LIBSERIALDV_INCLUDE_DIR}, ${LIBSERIALDV_LIBRARY}")
-    endif (NOT SerialDV_FIND_QUIETLY)
-else (LIBSERIALDV_FOUND)
-    if (SerialDV_FIND_REQUIRED)
-        message (FATAL_ERROR "Could not find SerialDV")
-    endif (SerialDV_FIND_REQUIRED)
-endif (LIBSERIALDV_FOUND)
+        if (SerialDV_FIND_REQUIRED)
+            message (FATAL_ERROR "Could not find SerialDV")
+        endif (SerialDV_FIND_REQUIRED)
+    endif (LIBSERIALDV_INCLUDE_DIR AND LIBSERIALDV_LIBRARY)

-mark_as_advanced(LIBSERIALDV_INCLUDE_DIR LIBSERIALDV_LIBRARY)
+    mark_as_advanced(LIBSERIALDV_INCLUDE_DIR LIBSERIALDV_LIBRARY)
+endif (NOT LIBSERIALDV_FOUND)
--- a/debian/rules
+++ b/debian/rules
--- a/devices/bladerf1/CMakeLists.txt
+++ b/devices/bladerf1/CMakeLists.txt
@ -21,7 +21,7 @@ add_library(bladerf1device SHARED
    ${bladerf1device_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBBLADERF_EXTERNAL)
    add_dependencies(bladerf1device bladerf)
 endif()

--- a/devices/bladerf2/CMakeLists.txt
+++ b/devices/bladerf2/CMakeLists.txt
@ -18,7 +18,7 @@ add_library(bladerf2device SHARED
    ${bladerf2device_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBBLADERF_EXTERNAL)
    add_dependencies(bladerf2device bladerf)
 endif()

--- a/devices/hackrf/CMakeLists.txt
+++ b/devices/hackrf/CMakeLists.txt
@ -29,7 +29,7 @@ target_link_libraries(hackrfdevice
    sdrbase
 )

-if(ENABLE_EXTERNAL_LIBRARIES AND NOT LINUX)
+if(LIBHACKRF_EXTERNAL AND NOT LINUX)
    add_dependencies(hackrfdevice hackrf)
 endif()

--- a/devices/limesdr/CMakeLists.txt
+++ b/devices/limesdr/CMakeLists.txt
@ -28,7 +28,7 @@ target_link_libraries(limesdrdevice
    sdrbase
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIMESUITE_EXTERNAL)
    add_dependencies(limesdrdevice limesuite)
 endif()

--- a/devices/perseus/CMakeLists.txt
+++ b/devices/perseus/CMakeLists.txt
@ -19,7 +19,7 @@ add_library(perseusdevice SHARED
    ${perseusdevice_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBPERSEUS_EXTERNAL)
    add_dependencies(perseusdevice perseus)
 endif()

--- a/devices/plutosdr/CMakeLists.txt
+++ b/devices/plutosdr/CMakeLists.txt
@ -35,7 +35,7 @@ target_link_libraries(plutosdrdevice
    ${ICONV_LIBRARY}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBIIO_EXTERNAL)
    add_dependencies(plutosdrdevice libiio)
 endif()

--- a/devices/soapysdr/CMakeLists.txt
+++ b/devices/soapysdr/CMakeLists.txt
@ -30,7 +30,7 @@ target_link_libraries(soapysdrdevice
    sdrbase
 )

-if(ENABLE_EXTERNAL_LIBRARIES AND NOT LINUX)
+if(SOAPYSDR_EXTERNAL AND NOT LINUX)
    add_dependencies(soapysdrdevice soapysdr)
 endif()

--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
--- a/plugins/channelrx/demoddsd/CMakeLists.txt
+++ b/plugins/channelrx/demoddsd/CMakeLists.txt
@ -57,7 +57,7 @@ add_library(${TARGET_NAME} SHARED
 	${dsddemod_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBDSDCC_EXTERNAL)
    add_dependencies(${TARGET_NAME} dsdcc)
 endif()

@ -67,7 +67,7 @@ target_link_libraries(${TARGET_NAME}
 	sdrbase
 	${TARGET_LIB_GUI}
    ${LIBDSDCC_LIBRARIES}
-    ${LIBMBE_LIBRARY}
+    ${LIBMBE_LIBRARIES}
 )

 install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
--- a/plugins/channelrx/demodfreedv/CMakeLists.txt
+++ b/plugins/channelrx/demodfreedv/CMakeLists.txt
@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED
 	${freedv_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(CODEC2_EXTERNAL)
    add_dependencies(${TARGET_NAME} codec2)
 endif()

--- a/plugins/channelrx/remotesink/CMakeLists.txt
+++ b/plugins/channelrx/remotesink/CMakeLists.txt
@ -63,7 +63,7 @@ add_library(${TARGET_NAME} SHARED
 	${remotesink_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(CM256CC_EXTERNAL)
    add_dependencies(${TARGET_NAME} cm256cc)
 endif()

--- a/plugins/channeltx/modfreedv/CMakeLists.txt
+++ b/plugins/channeltx/modfreedv/CMakeLists.txt
@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED
 	${modfreedv_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(CODEC2_EXTERNAL)
    add_dependencies(${TARGET_NAME} codec2)
 endif()

--- a/plugins/channeltx/remotesource/CMakeLists.txt
+++ b/plugins/channeltx/remotesource/CMakeLists.txt
@ -63,7 +63,7 @@ add_library(${TARGET_NAME} SHARED
 	${remotesource_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(CM256CC_EXTERNAL)
    add_dependencies(${TARGET_NAME} cm256cc)
 endif()

--- a/plugins/samplesink/bladerf1output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf1output/CMakeLists.txt
@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 	${bladerf1output_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBBLADERF_EXTERNAL)
    add_dependencies(${TARGET_NAME} bladerf)
 endif()

--- a/plugins/samplesink/bladerf2output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf2output/CMakeLists.txt
@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 	${bladerf2output_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBBLADERF_EXTERNAL)
    add_dependencies(${TARGET_NAME} bladerf)
 endif()

--- a/plugins/samplesink/limesdroutput/CMakeLists.txt
+++ b/plugins/samplesink/limesdroutput/CMakeLists.txt
@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 	${limesdroutput_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIMESUITE_EXTERNAL)
    add_dependencies(${TARGET_NAME} limesuite)
 endif()

--- a/plugins/samplesink/plutosdroutput/CMakeLists.txt
+++ b/plugins/samplesink/plutosdroutput/CMakeLists.txt
@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 	${plutosdroutput_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBIIO_EXTERNAL)
    add_dependencies(${TARGET_NAME} libiio)
 endif()

--- a/plugins/samplesink/remoteoutput/CMakeLists.txt
+++ b/plugins/samplesink/remoteoutput/CMakeLists.txt
@ -63,7 +63,7 @@ add_library(${TARGET_NAME} SHARED
 	${remoteoutput_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(CM256CC_EXTERNAL)
    add_dependencies(${TARGET_NAME} cm256cc)
 endif()

--- a/plugins/samplesource/airspy/CMakeLists.txt
+++ b/plugins/samplesource/airspy/CMakeLists.txt
@ -47,7 +47,7 @@ add_library(${TARGET_NAME} SHARED
 	${airspy_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES AND NOT LINUX)
+if(LIBAIRSPY_EXTERNAL AND NOT LINUX)
    add_dependencies(${TARGET_NAME} airspy)
 endif()

--- a/plugins/samplesource/airspyhf/CMakeLists.txt
+++ b/plugins/samplesource/airspyhf/CMakeLists.txt
@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED
 	${airspyhf_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBAIRSPYHF_EXTERNAL)
    add_dependencies(${TARGET_NAME} airspyhf)
 endif()

--- a/plugins/samplesource/bladerf1input/CMakeLists.txt
+++ b/plugins/samplesource/bladerf1input/CMakeLists.txt
@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 	${bladerf1input_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBBLADERF_EXTERNAL)
    add_dependencies(${TARGET_NAME} bladerf)
 endif()

--- a/plugins/samplesource/bladerf2input/CMakeLists.txt
+++ b/plugins/samplesource/bladerf2input/CMakeLists.txt
@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 	${bladerf2input_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBBLADERF_EXTERNAL)
    add_dependencies(${TARGET_NAME} bladerf)
 endif()

--- a/plugins/samplesource/limesdrinput/CMakeLists.txt
+++ b/plugins/samplesource/limesdrinput/CMakeLists.txt
@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 	${limesdrinput_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIMESUITE_EXTERNAL)
    add_dependencies(${TARGET_NAME} limesuite)
 endif()

--- a/plugins/samplesource/perseus/CMakeLists.txt
+++ b/plugins/samplesource/perseus/CMakeLists.txt
@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED
 	${perseus_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBPERSEUS_EXTERNAL)
    add_dependencies(${TARGET_NAME} perseus)
 endif()

--- a/plugins/samplesource/plutosdrinput/CMakeLists.txt
+++ b/plugins/samplesource/plutosdrinput/CMakeLists.txt
@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 	${plutosdrinput_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(LIBIIO_EXTERNAL)
    add_dependencies(${TARGET_NAME} libiio)
 endif()

--- a/plugins/samplesource/remoteinput/CMakeLists.txt
+++ b/plugins/samplesource/remoteinput/CMakeLists.txt
@ -60,7 +60,7 @@ add_library(${TARGET_NAME} SHARED
 	${remoteinput_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES)
+if(CM256CC_EXTERNAL)
    add_dependencies(${TARGET_NAME} cm256cc)
 endif()

--- a/plugins/samplesource/sdrplay/CMakeLists.txt
+++ b/plugins/samplesource/sdrplay/CMakeLists.txt
@ -48,6 +48,10 @@ add_library(${TARGET_NAME} SHARED
 	${sdrplay_SOURCES}
 )

+if(LIBMIRISDR_EXTERNAL)
+    add_dependencies(${TARGET_NAME} libmirisdr)
+endif(LIBMIRISDR_EXTERNAL)
+
 target_link_libraries(${TARGET_NAME}
        Qt5::Core
        ${TARGET_LIB}
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@ -326,7 +326,11 @@ add_library(sdrbase SHARED
    ${sdrbase_SOURCES}
 )

-if(ENABLE_EXTERNAL_LIBRARIES AND LIBSERIALDV_FOUND)
+if(LIMESUITE_EXTERNAL)
+    add_dependencies(sdrbase limesuite)
+endif()
+
+if(LIBSERIALDV_EXTERNAL)
    add_dependencies(sdrbase serialdv)
 endif()