Session: Fix issue #67 by improving error handling

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08d0ded57cbe6f7bed52f5e5fcf70f8c0e8c7336..ec86073dcf956eb97fc03345f95e0b95abbcca70 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,30 +83,46 @@ 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_EQUAL "3.8.0" OR CMAKE_VERSION VERSION_GREATER "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)
 
 # Try to find the prefered glibmm-2.4. If not found then add glibmm-2.68
 # to the dependency list.
-pkg_check_modules(GLIBMM_2_4 glibmm-2.4>2.28.0)
+pkg_check_modules(GLIBMM_2_4 glibmm-2.4>=2.28.0)
 if(GLIBMM_2_4_FOUND)
        list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
 else()