From 0f5a90952b28a74204a3de81ff4a7ab8caf7845f Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 23 Dec 2020 09:36:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D0=BB=D0=B0=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?= =?UTF-8?q?=D0=B9=20CMake=20<=203.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibCompilerFlags.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CMLibCompilerFlags.cmake b/CMLibCompilerFlags.cmake index a68a4ff..b135938 100644 --- a/CMLibCompilerFlags.cmake +++ b/CMLibCompilerFlags.cmake @@ -36,10 +36,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED YES) check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17) if(HAVE_FLAG_STD_CXX17) - set(CMAKE_CXX_STANDARD 17) - check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17) - if(HAVE_FLAG_STD_GNUXX17) - set(CMAKE_CXX_EXTENSIONS YES) + if(${CMAKE_VERSION} VERSION_LESS "3.8.0") + check_enable_cxx_flag(-std=c++17) + else() + set(CMAKE_CXX_STANDARD 17) + check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17) + if(HAVE_FLAG_STD_GNUXX17) + set(CMAKE_CXX_EXTENSIONS YES) + endif() endif() else() check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14)