From f2ee747a382e64d87b67e87d16a96b4d9e4ce67d Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Thu, 25 Jun 2020 09:20:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=B8=D1=81=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20C++14,=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D1=87=D0=B5=20=D0=A1++11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMLibCompilerFlags.cmake | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/CMLibCompilerFlags.cmake b/CMLibCompilerFlags.cmake
index 2868e39..7afb7c6 100644
--- a/CMLibCompilerFlags.cmake
+++ b/CMLibCompilerFlags.cmake
@@ -31,12 +31,23 @@ else()
   endif()
 endif()
 
+# Выбор стандарта по умолчанию (можно переопределить в проекте)
+set(CMAKE_CXX_STANDARD_REQUIRED YES)
+
+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()
+
 # Common configuration for GCC, clang and Intel.
 if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_INTEL OR CMAKE_CXX_COMPILER_IS_GCC)
-  set(CMAKE_CXX_STANDARD 11)
-  set(CMAKE_CXX_STANDARD_REQUIRED YES)
-  set(CMAKE_CXX_EXTENSIONS YES)
-
   if(CMLIB_WARNING_FLAGS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
     check_enable_cxx_flag(-Wall)
     check_enable_cxx_flag(-Wextra)