From 9b9d6c6d65ba0aacd42e155b433a0d0c51ad7c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= <leo@yuriev.ru>
Date: Sat, 9 Nov 2024 23:02:56 +0300
Subject: [PATCH] =?UTF-8?q?mdbx-cmake:=20=D0=BE=D1=87=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D1=82=D0=BE=D0=B2=20C=20?=
 =?UTF-8?q?=D0=B8=20C++.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt       | 8 +++++---
 cmake/compiler.cmake | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59dcada5..c2ce48e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -804,13 +804,15 @@ macro(target_setup_options TARGET)
     set_target_properties(${TARGET} PROPERTIES
       INTERPROCEDURAL_OPTIMIZATION $<BOOL:${INTERPROCEDURAL_OPTIMIZATION}>)
   endif()
-  if(NOT MDBX_C_STANDARD EQUAL 11 OR (NOT C_FALLBACK_GNU11 AND NOT C_FALLBACK_11))
+  if(NOT C_FALLBACK_GNU11 AND NOT C_FALLBACK_11)
     set_target_properties(${TARGET} PROPERTIES
       C_STANDARD ${MDBX_C_STANDARD} C_STANDARD_REQUIRED ON)
   endif()
   if(MDBX_BUILD_CXX)
-    set_target_properties(${TARGET} PROPERTIES
-      CXX_STANDARD ${MDBX_CXX_STANDARD} CXX_STANDARD_REQUIRED ON)
+    if(NOT CXX_FALLBACK_GNU11 AND NOT CXX_FALLBACK_11)
+      set_target_properties(${TARGET} PROPERTIES
+        CXX_STANDARD ${MDBX_CXX_STANDARD} CXX_STANDARD_REQUIRED ON)
+    endif()
     if(MSVC AND NOT MSVC_VERSION LESS 1910)
       target_compile_options(${TARGET} INTERFACE "/Zc:__cplusplus")
     endif()
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index e05df1a6..f9c23c20 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -386,7 +386,7 @@ endif()
 if(CMAKE_CXX_COMPILER_LOADED)
   list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_std_11 HAS_CXX11)
   if(HAS_CXX11 LESS 0)
-    if (MSVC)
+    if(MSVC)
       check_cxx_compiler_flag("/std:c++11" CXX_FALLBACK_11)
     else()
       check_cxx_compiler_flag("-std=gnu++11" CXX_FALLBACK_GNU11)
@@ -401,7 +401,7 @@ endif()
 if(CMAKE_C_COMPILER_LOADED)
   list(FIND CMAKE_C_COMPILE_FEATURES c_std_11 HAS_C11)
   if(HAS_C11 LESS 0)
-    if (MSVC)
+    if(MSVC)
       check_c_compiler_flag("/std:c11" C_FALLBACK_11)
     else()
       check_c_compiler_flag("-std=gnu11" C_FALLBACK_GNU11)