mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 12:10:34 +00:00
Code Issues Releases Wiki Activity

Fix building for UHD 4.0.0.0

Browse Source
This commit is contained in:
Carles Fernandez 2021-04-26 09:33:36 +02:00
parent 04c61536c6
commit 7fda06adb8
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -620,11 +620,13 @@ if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17)
) )
endif() endif()
if(FILESYSTEM_FOUND) if(FILESYSTEM_FOUND)
if(CMAKE_VERSION VERSION_LESS 3.13)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
else() 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)))
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
endif() endif()
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif() endif()
endif() endif()

1
docs/changelog.md
View File

@ -92,6 +92,7 @@ SPDX-FileCopyrightText: 2011-2021 Carles Fernandez-Prades <carles.fernandez@cttc
- Fix bug in searching for gr-iio when CMake was re-run several times with - Fix bug in searching for gr-iio when CMake was re-run several times with
different settings for the `-DENABLE_FMCOMMS2` or `-DENABLE_PLUTOSDR` building different settings for the `-DENABLE_FMCOMMS2` or `-DENABLE_PLUTOSDR` building
options. options.
- Fix building when using UHD v4.0.0.0.
&nbsp; &nbsp;