From bf5edf32ccb22b9787e08bf33aa6bca14413a4d3 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 29 Oct 2021 01:36:55 +0200 Subject: [PATCH] Fix building against UHD 3.15.0.0-5 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1225e8d23..694877965 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -645,14 +645,14 @@ 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 does not support C++20 + # UHD 3.15.0.0-5 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(((NOT UHD_FOUND) OR (UHD_FOUND AND ("${UHD_VERSION}" VERSION_LESS 3.14.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 ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0"))) - set(CMAKE_CXX_STANDARD 23) + # set(CMAKE_CXX_STANDARD 23) endif() endif() endif()