From: Vladislav Shchapov <vladislav@shchapov.ru>
Date: Tue, 17 Sep 2024 15:08:41 +0000 (+0500)
Subject: Allow overridde CMAKE_CXX_STANDARD, CMAKE_CXX_STANDARD_REQUIRED, CMAKE_CXX_EXTENSIONS... 
X-Git-Tag: 2.2.3~44
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ce93943af08be65301721d381a9a446f6b515686;p=thirdparty%2Fzlib-ng.git

Allow overridde CMAKE_CXX_STANDARD, CMAKE_CXX_STANDARD_REQUIRED, CMAKE_CXX_EXTENSIONS variables for tests and benchmarks.

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

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 48137333..041b658d 100644
--- 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 0f812498..1e6671ff 100644
--- 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)