Now GPSTk supports C++20

This commit is contained in:
Carles Fernandez 2019-10-30 11:50:02 +01:00
parent 58af2dc2be
commit f25fa45f21
1 changed files with 13 additions and 15 deletions

View File

@ -631,22 +631,20 @@ set(FILESYSTEM_FOUND FALSE)
if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17) if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17)
# Check if we have std::filesystem # Check if we have std::filesystem
if(NOT (CMAKE_VERSION VERSION_LESS 3.8)) if(NOT (CMAKE_VERSION VERSION_LESS 3.8))
if((NOT ENABLE_UNIT_TESTING_EXTRA) AND (NOT ENABLE_SYSTEM_TESTING_EXTRA) AND (NOT ENABLE_FPGA)) # Workaround for GPSTk find_package(FILESYSTEM COMPONENTS Final Experimental)
find_package(FILESYSTEM COMPONENTS Final Experimental) set_package_properties(FILESYSTEM PROPERTIES
set_package_properties(FILESYSTEM PROPERTIES URL "https://en.cppreference.com/w/cpp/filesystem"
URL "https://en.cppreference.com/w/cpp/filesystem" DESCRIPTION "Provides facilities for performing operations on file systems and their components"
DESCRIPTION "Provides facilities for performing operations on file systems and their components" PURPOSE "Work with paths, regular files, and directories."
PURPOSE "Work with paths, regular files, and directories." TYPE OPTIONAL
TYPE OPTIONAL )
) if(${FILESYSTEM_FOUND})
if(${FILESYSTEM_FOUND}) if(CMAKE_VERSION VERSION_LESS 3.12)
if(CMAKE_VERSION VERSION_LESS 3.12) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 17) else()
else() set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD 20)
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif() endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif() endif()
endif() endif()
endif() endif()