diff --git a/meson.build b/meson.build index 5655f04..3d3b04e 100644 --- a/meson.build +++ b/meson.build @@ -4,10 +4,11 @@ project( # however newer versions of gtest requires C++14 default_options: ['cpp_std=c++14', 'warning_level=3'], license: 'MIT', - version: '3.3.2', + version: '3.3.3', ) cxx = meson.get_compiler('cpp') +cpp_std = get_option('cpp_std') ## at best we might try to test if this code compiles ## testing for compilers or platforms is not reliable enough @@ -91,11 +92,12 @@ sqlitecpp_test_args = [] ## 'auto' return without trailing return type; deduced return types are a C++14 extension if host_machine.system() == 'windows' ## check if the std version is less than c++14 - if get_option('cpp_std').endswith('11') - message('[WINDOWS] using c++14 standard') - message('[WINDOWS] you can disable this warning by setting cpp_std to c++14 or newer') + if cpp_std.version_compare('=1.14.0') - ## check if the std version is less than c++14 - if get_option('cpp_std').version_compare('=1.17.0') and cpp_std.version_compare('=1.14.0') and cpp_std.version_compare('