From e40b98b381344fedda83c8fd5666a93fa9669676 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 23 Sep 2023 15:09:15 +0100 Subject: [PATCH] Don't build UHD it ENABLE_EXTERNAL_LIBRARIES=AUTO --- external/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index e26f48922..0b595e6d7 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1478,7 +1478,7 @@ if (WIN32 OR APPLE) endif () endif (ENABLE_BLADERF) - if (ENABLE_USRP AND Boost_FOUND AND NOT WIN32) + if (ENABLE_USRP AND Boost_FOUND AND NOT WIN32 AND ((NOT UHD_FOUND) OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON")) ExternalProject_Add(uhd GIT_REPOSITORY https://github.com/EttusResearch/uhd.git GIT_TAG v4.2.0.0 @@ -1504,7 +1504,7 @@ if (WIN32 OR APPLE) set(UHD_LIBRARIES "${install_dir}/lib/libuhd${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${install_dir}/lib") endif () - endif (ENABLE_USRP AND Boost_FOUND AND NOT WIN32) + endif (ENABLE_USRP AND Boost_FOUND AND NOT WIN32 AND ((NOT UHD_FOUND) OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON")) endif (WIN32 OR APPLE)