From 272db9ce598063f36fc269a103ba11669b64fe0f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 27 Oct 2021 18:58:55 +0200 Subject: [PATCH] Fix building against GNU Radio master (currently 3.10.0.git), since it breaks when the C++ standard is C++20 --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 589b651a2..1225e8d23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -645,8 +645,9 @@ if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17) if(FILESYSTEM_FOUND) set(CMAKE_CXX_STANDARD 17) if(CMAKE_VERSION VERSION_GREATER 3.13) - # UHD 4.0.0.0 still does not support C++20 - if((NOT UHD_FOUND) OR (UHD_FOUND AND ("${UHD_VERSION}" VERSION_LESS 3.99))) + # UHD 4.0.0.0 does not support C++20 + # GNU Radio 3.10.0.git does not support C++20 + if(((NOT UHD_FOUND) OR (UHD_FOUND AND ("${UHD_VERSION}" VERSION_LESS 3.99))) AND (GNURADIO_VERSION VERSION_LESS 3.9.99)) set(CMAKE_CXX_STANDARD 20) if(CMAKE_VERSION VERSION_GREATER 3.20.99) if(((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "11.0.0")) OR