From 2b257f87d75c76576545b946782ec341786f02bd Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 22 Apr 2020 11:09:06 +0200 Subject: [PATCH] Set C++ standard to 14 if linking against GPSTk with gcc --- CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e4a8f1b4..18fb4188c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -533,13 +533,17 @@ set(FILESYSTEM_FOUND FALSE) if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17) # Check if we have std::filesystem if(NOT (CMAKE_VERSION VERSION_LESS 3.8)) - find_package(FILESYSTEM COMPONENTS Final Experimental) - set_package_properties(FILESYSTEM PROPERTIES - URL "https://en.cppreference.com/w/cpp/filesystem" - DESCRIPTION "Provides facilities for performing operations on file systems and their components" - PURPOSE "Work with paths, regular files, and directories." - TYPE OPTIONAL - ) + if((NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")) + OR NOT (ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)) + # Fix for GPTSk + find_package(FILESYSTEM COMPONENTS Final Experimental) + set_package_properties(FILESYSTEM PROPERTIES + URL "https://en.cppreference.com/w/cpp/filesystem" + DESCRIPTION "Provides facilities for performing operations on file systems and their components" + PURPOSE "Work with paths, regular files, and directories." + TYPE OPTIONAL + ) + endif() if(${FILESYSTEM_FOUND}) if(CMAKE_VERSION VERSION_LESS 3.13) set(CMAKE_CXX_STANDARD 17)