From b725122c891e57689233174a5d2904610c1339d2 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 23 Dec 2020 11:03:49 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=20=D1=81=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80?= =?UTF-8?q?=D1=82=D0=B0=20C++17"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a0cc72077c11defd55d44228e48f9e560577323d. --- CMLibCompilerFlags.cmake | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/CMLibCompilerFlags.cmake b/CMLibCompilerFlags.cmake index a68a4ff..7afb7c6 100644 --- a/CMLibCompilerFlags.cmake +++ b/CMLibCompilerFlags.cmake @@ -34,25 +34,16 @@ endif() # Выбор стандарта по умолчанию (можно переопределить в проекте) 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) +check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14) +if(HAVE_FLAG_STD_CXX14) + set(CMAKE_CXX_STANDARD 14) + check_cxx_compiler_flag(-std=gnu++14 HAVE_FLAG_STD_GNUXX14) + if(HAVE_FLAG_STD_GNUXX14) set(CMAKE_CXX_EXTENSIONS YES) endif() else() - check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14) - if(HAVE_FLAG_STD_CXX14) - set(CMAKE_CXX_STANDARD 14) - check_cxx_compiler_flag(-std=gnu++14 HAVE_FLAG_STD_GNUXX14) - if(HAVE_FLAG_STD_GNUXX14) - set(CMAKE_CXX_EXTENSIONS YES) - endif() - else() - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_EXTENSIONS YES) - endif() + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_EXTENSIONS YES) endif() # Common configuration for GCC, clang and Intel.