mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-12 00:07:12 +03:00
485ea72f64
Removed bundled gtest; it wasn't used, but its existence was triggering cmake QA warning Closes: https://bugs.gentoo.org/957557 Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Part-of: https://github.com/gentoo/gentoo/pull/43303 Signed-off-by: Sam James <sam@gentoo.org>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
https://bugs.gentoo.org/957557
|
|
From c9371de7836d113c0b14bfa15ca70f00ebb3ac6f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de>
|
|
Date: Mon, 24 Mar 2025 08:32:25 +0100
|
|
Subject: [PATCH] [cmake] Require minimum CMake version 3.5
|
|
|
|
Soon CMake 4.0 will be released. It requires that projects
|
|
set a minimum required CMake version of 3.5. There is a
|
|
workaround with an additional flag, but it would is better
|
|
to increase the minimum required version.
|
|
---
|
|
CMakeLists.txt | 6 +++---
|
|
test/CMakeLists.txt | 1 -
|
|
2 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 7e8a528d8..0df533a5a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1,5 +1,6 @@
|
|
-# 3.5 is actually available almost everywhere, but this a good minimum
|
|
-cmake_minimum_required(VERSION 3.4)
|
|
+# 3.5 is actually available almost everywhere.
|
|
+# 3.30 as the upper policy limit avoids CMake deprecation warnings.
|
|
+cmake_minimum_required(VERSION 3.5...3.30)
|
|
|
|
# enable MSVC_RUNTIME_LIBRARY target property
|
|
# see https://cmake.org/cmake/help/latest/policy/CMP0091.html
|
|
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
|
index 1c60c07c5..6949d29c1 100644
|
|
--- a/test/CMakeLists.txt
|
|
+++ b/test/CMakeLists.txt
|
|
@@ -3,6 +3,5 @@ find_package(Threads REQUIRED)
|
|
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
|
set(BUILD_MOCK ON CACHE BOOL "" FORCE)
|
|
-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
|
|
|
|
if(YAML_USE_SYSTEM_GTEST)
|
|
find_package(GTest)
|