mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-14 04:00:34 +00:00
Fix building against UHD 3.15.0.0-5
This commit is contained in:
parent
de2c19804d
commit
bf5edf32cc
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user