X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;fp=CMakeLists.txt;h=c206d9158dc0994761ea88538c39670934fab1ec;hp=395222a25a7838a1717eb0c4427850d32696ebaa;hb=cb40d40c6c60f2b1bec744ad946253e3d8c56c13;hpb=e0a90b4c5d6b1163a2cbece13a90f2737f0814d4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 395222a2..c206d915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,23 +83,39 @@ include(memaccess) find_package(PkgConfig) -check_cxx_compiler_flag("-std=c++17" HAVE_STD_CXX_17) -check_cxx_compiler_flag("-std=c++14" HAVE_STD_CXX_14) -check_cxx_compiler_flag("-std=c++11" HAVE_STD_CXX_11) -if(HAVE_STD_CXX_17) - message(STATUS "Using C++17 for the application build") - set(CMAKE_CXX_STANDARD 17) - set(REQUIRED_STD_CXX_FLAGS "-std=c++17") -elseif(HAVE_STD_CXX_14) - message(STATUS "Using C++14 for the application build") - set(CMAKE_CXX_STANDARD 14) - set(REQUIRED_STD_CXX_FLAGS "-std=c++14") -elseif(HAVE_STD_CXX_11) - message(STATUS "Using C++11 for the application build") - set(CMAKE_CXX_STANDARD 11) - set(REQUIRED_STD_CXX_FLAGS "-std=c++11") +if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.8.0") + check_cxx_compiler_flag("-std=c++17" HAVE_STD_CXX_17) + check_cxx_compiler_flag("-std=c++14" HAVE_STD_CXX_14) + check_cxx_compiler_flag("-std=c++11" HAVE_STD_CXX_11) + if(HAVE_STD_CXX_17) + message(STATUS "Using C++17 for the application build") + set(CMAKE_CXX_STANDARD 17) + set(REQUIRED_STD_CXX_FLAGS "-std=c++17") + elseif(HAVE_STD_CXX_14) + message(STATUS "Using C++14 for the application build") + set(CMAKE_CXX_STANDARD 14) + set(REQUIRED_STD_CXX_FLAGS "-std=c++14") + elseif(HAVE_STD_CXX_11) + message(STATUS "Using C++11 for the application build") + set(CMAKE_CXX_STANDARD 11) + set(REQUIRED_STD_CXX_FLAGS "-std=c++11") + else() + message(FATAL_ERROR "Need modern C++, at least language standard 11") + endif() else() - message(FATAL_ERROR "Need modern C++, at least language standard 11") + check_cxx_compiler_flag("-std=c++14" HAVE_STD_CXX_14) + check_cxx_compiler_flag("-std=c++11" HAVE_STD_CXX_11) + if(HAVE_STD_CXX_14) + message(STATUS "Using C++14 for the application build") + set(CMAKE_CXX_STANDARD 14) + set(REQUIRED_STD_CXX_FLAGS "-std=c++14") + elseif(HAVE_STD_CXX_11) + message(STATUS "Using C++11 for the application build") + set(CMAKE_CXX_STANDARD 11) + set(REQUIRED_STD_CXX_FLAGS "-std=c++11") + else() + message(FATAL_ERROR "Need modern C++, at least language standard 11") + endif() endif() list(APPEND PKGDEPS glib-2.0>=2.28.0)