From 63c433a82e51e90796a74bd58939c5e879e7bcd6 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sun, 30 May 2021 20:53:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=B1=D0=BB=D0=B0=D1=81=D1=82=D1=8C?= =?UTF-8?q?=20=D0=B2=D0=B8=D0=B4=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibCompilerFlags.cmake | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/CMLibCompilerFlags.cmake b/CMLibCompilerFlags.cmake index 57d72da..d3f9fea 100644 --- a/CMLibCompilerFlags.cmake +++ b/CMLibCompilerFlags.cmake @@ -20,21 +20,20 @@ macro(CHECK_ENABLE_CXX_FLAG flag) endmacro() function(cmlib_set_cxx_standard version) - # Выбор стандарта по умолчанию (можно переопределить в проекте) - set(CMAKE_CXX_STANDARD_REQUIRED YES) + set(CMAKE_CXX_STANDARD_REQUIRED YES PARENT_SCOPE) - if(version STREQUAL "11") - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_EXTENSIONS YES) + if(version EQUAL 11) + set(CMAKE_CXX_STANDARD 11 PARENT_SCOPE) + set(CMAKE_CXX_EXTENSIONS YES PARENT_SCOPE) endif() - if(version STREQUAL "14") - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_EXTENSIONS YES) + if(version EQUAL 14) + set(CMAKE_CXX_STANDARD 14 PARENT_SCOPE) + set(CMAKE_CXX_EXTENSIONS YES PARENT_SCOPE) endif() - if(version STREQUAL "17") + if(version EQUAL 17) if(${CMAKE_VERSION} VERSION_LESS "3.10.0") check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17) if(HAVE_FLAG_STD_GNUXX17) @@ -56,8 +55,8 @@ function(cmlib_set_cxx_standard version) endif() endif() else() - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_EXTENSIONS YES) + set(CMAKE_CXX_STANDARD 17 PARENT_SCOPE) + set(CMAKE_CXX_EXTENSIONS YES PARENT_SCOPE) endif() endif() endfunction()