Allow overridde CMAKE_CXX_STANDARD, CMAKE_CXX_STANDARD_REQUIRED, CMAKE_CXX_EXTENSIONS...

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 481373334344237468b57f9a306392b88e81ead7..041b658dbb2058467351379fa66017b1bbc01f19 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -107,7 +107,9 @@ endif()
 
 if(WITH_GTEST)
     # Google test requires at least C++11
-    set(CMAKE_CXX_STANDARD 11)
+    if(NOT DEFINED CMAKE_CXX_STANDARD)
+        set(CMAKE_CXX_STANDARD 11)
+    endif()
 
     # Google test requires MSAN instrumented LLVM C++ libraries
     if(WITH_SANITIZER STREQUAL "Memory")

diff --git a/test/benchmarks/CMakeLists.txt b/test/benchmarks/CMakeLists.txt
index 0f812498127dbf79334dc03f23cde04378dc7828..1e6671ffe4ef2497ec96910a653af3c247260254 100644 (file)
--- a/test/benchmarks/CMakeLists.txt
+++ b/test/benchmarks/CMakeLists.txt
@@ -2,9 +2,15 @@ cmake_minimum_required(VERSION 3.12)
 
 include(FetchContent)
 
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS ON)
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 11)
+endif()
+if(NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+if(NOT DEFINED CMAKE_CXX_EXTENSIONS)
+    set(CMAKE_CXX_EXTENSIONS ON)
+endif()
 
 enable_language(CXX)