1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
From 2857419531c45e542afdc52001a65733f4f9b128 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <locutusofborg@debian.org>
Date: Mon, 8 Sep 2025 15:05:10 +0200
Subject: [PATCH 1/3] Bump minimum required cmake version to 3.10, for new
cmake 4 compatibility fix
---
CMakeLists.txt | 2 +-
cmake/cotire.cmake | 2 +-
src/test/gtest/CMakeLists.txt | 2 +-
src/test/gtest/googlemock/CMakeLists.txt | 2 +-
src/test/gtest/googletest/CMakeLists.txt | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
Index: lucene++/CMakeLists.txt
===================================================================
--- lucene++.orig/CMakeLists.txt
+++ lucene++/CMakeLists.txt
@@ -2,7 +2,7 @@
# init
####################################
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(lucene++)
@@ -47,7 +47,7 @@
include(Lucene++Docs)
# Enable C++11
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
####################################
Index: lucene++/cmake/cotire.cmake
===================================================================
--- lucene++.orig/cmake/cotire.cmake
+++ lucene++/cmake/cotire.cmake
@@ -37,7 +37,7 @@
if (NOT CMAKE_SCRIPT_MODE_FILE)
cmake_policy(PUSH)
endif()
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
if (NOT CMAKE_SCRIPT_MODE_FILE)
cmake_policy(POP)
endif()
Index: lucene++/src/test/gtest/CMakeLists.txt
===================================================================
--- lucene++.orig/src/test/gtest/CMakeLists.txt
+++ lucene++/src/test/gtest/CMakeLists.txt
@@ -1,7 +1,7 @@
# Note: CMake support is community-based. The maintainers do not use CMake
# internally.
-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 3.10)
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
@@ -11,9 +11,9 @@
set(GOOGLETEST_VERSION 1.10.0)
if (CMAKE_VERSION VERSION_LESS "3.1")
- add_definitions(-std=c++11)
+ add_definitions(-std=c++17)
else()
- set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT CYGWIN)
set(CMAKE_CXX_EXTENSIONS OFF)
Index: lucene++/src/test/gtest/googlemock/CMakeLists.txt
===================================================================
--- lucene++.orig/src/test/gtest/googlemock/CMakeLists.txt
+++ lucene++/src/test/gtest/googlemock/CMakeLists.txt
@@ -42,7 +42,7 @@
cmake_policy(SET CMP0048 NEW)
project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
endif()
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 3.10)
if (COMMAND set_up_hermetic_build)
set_up_hermetic_build()
Index: lucene++/src/test/gtest/googletest/CMakeLists.txt
===================================================================
--- lucene++.orig/src/test/gtest/googletest/CMakeLists.txt
+++ lucene++/src/test/gtest/googletest/CMakeLists.txt
@@ -53,7 +53,7 @@
cmake_policy(SET CMP0048 NEW)
project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
endif()
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 3.10)
if (POLICY CMP0063) # Visibility
cmake_policy(SET CMP0063 NEW)
Index: lucene++/src/test/CMakeLists.txt
===================================================================
--- lucene++.orig/src/test/CMakeLists.txt
+++ lucene++/src/test/CMakeLists.txt
@@ -8,8 +8,10 @@
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
endif()
-add_subdirectory(gtest)
-
+find_package(GTest)
+if(NOT GTEST_FOUND)
+ add_subdirectory(gtest)
+endif()
####################################
# src
|
