tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From a1f4fa1607249b0356c2cd2c54134cb3dc2dc231 Mon Sep 17 00:00:00 2001
2From: Stanislas Marquis <stan@astrorigin.com>
3Date: Fri, 3 Mar 2023 12:44:09 +0100
4Subject: [PATCH] Update cmake minimum version >= 3.16.3 (ubuntu FF)
5
6---
7 CMakeLists.txt | 2 +-
8 apps/faldoc/CMakeLists.txt | 2 +-
9 clt/falcon/editline/CMakeLists.txt | 4 ++--
10 dist/nsis/CMakeLists.txt | 2 +-
11 modules/native/MP/CMakeLists.txt | 2 +-
12 modules/native/conio/CMakeLists.txt | 2 +-
13 modules/native/curl/CMakeLists.txt | 2 +-
14 modules/native/dbi/CMakeLists.txt | 2 +-
15 modules/native/dbus/CMakeLists.txt | 2 +-
16 modules/native/dynlib/CMakeLists.txt | 2 +-
17 modules/native/feathers/CMakeLists.txt | 2 +-
18 modules/native/gd2/CMakeLists.txt | 2 +-
19 modules/native/gtk/CMakeLists.txt | 2 +-
20 modules/native/hpdf/CMakeLists.txt | 2 +-
21 modules/native/sdl/CMakeLists.txt | 2 +-
22 modules/native/wopi/CMakeLists.txt | 2 +-
23 tests/native/dynlib/CMakeLists.txt | 2 +-
24 17 files changed, 18 insertions(+), 18 deletions(-)
25
26diff --git a/CMakeLists.txt b/CMakeLists.txt
27index 81c404677..de2125e3d 100644
28--- a/CMakeLists.txt
29+++ b/CMakeLists.txt
30@@ -34,7 +34,7 @@
31 # List of available modules: CURL DBI DBUS DYNLIB GD2 GTK PDF SDL
32 #
33
34-cmake_minimum_required(VERSION 2.6.2)
35+cmake_minimum_required(VERSION 3.16.3)
36 project(Falcon)
37
38
39diff --git a/apps/faldoc/CMakeLists.txt b/apps/faldoc/CMakeLists.txt
40index 3e0867f63..7ef40d7b3 100644
41--- a/apps/faldoc/CMakeLists.txt
42+++ b/apps/faldoc/CMakeLists.txt
43@@ -4,7 +4,7 @@
44 # CMake configuration file for Feather modules
45 ####################################################################
46
47-cmake_minimum_required(VERSION 2.6.2)
48+cmake_minimum_required(VERSION 3.16.3)
49 project(falcon-app-faldoc)
50
51 set(FALDOC_DIR "${FALCON_APP_DIR}/faldoc" )
52diff --git a/clt/falcon/editline/CMakeLists.txt b/clt/falcon/editline/CMakeLists.txt
53index 8b51862ad..933ef0a13 100644
54--- a/clt/falcon/editline/CMakeLists.txt
55+++ b/clt/falcon/editline/CMakeLists.txt
56@@ -1,4 +1,4 @@
57-cmake_minimum_required(VERSION 2.6)
58+cmake_minimum_required(VERSION 3.16.3)
59 project(Editline)
60
61 find_package(Curses REQUIRED)
62@@ -23,4 +23,4 @@ configure_file(
63 ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
64 ${CMAKE_CURRENT_BINARY_DIR}/config.h
65 )
66-
67\ No newline at end of file
68+
69diff --git a/dist/nsis/CMakeLists.txt b/dist/nsis/CMakeLists.txt
70index c6e0110bb..996ce5436 100644
71--- a/dist/nsis/CMakeLists.txt
72+++ b/dist/nsis/CMakeLists.txt
73@@ -1,7 +1,7 @@
74 #
75 # Configurator for NSIS installer
76 #
77-cmake_minimum_required(VERSION 2.6)
78+cmake_minimum_required(VERSION 3.16.3)
79
80 #
81 # Files to be configured
82diff --git a/modules/native/MP/CMakeLists.txt b/modules/native/MP/CMakeLists.txt
83index 2b86107e0..f8eba5c40 100644
84--- a/modules/native/MP/CMakeLists.txt
85+++ b/modules/native/MP/CMakeLists.txt
86@@ -5,7 +5,7 @@
87 ####################################################################
88
89 PROJECT(MP)
90-cmake_minimum_required(VERSION 2.6)
91+cmake_minimum_required(VERSION 3.16.3)
92 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
93 # Set here project-wide options
94 # OPTION( WITH_OPT "An poption" OFF)
95diff --git a/modules/native/conio/CMakeLists.txt b/modules/native/conio/CMakeLists.txt
96index 104c9bcec..d828d7e09 100644
97--- a/modules/native/conio/CMakeLists.txt
98+++ b/modules/native/conio/CMakeLists.txt
99@@ -4,7 +4,7 @@
100 # CMake configuration file for @PROJECT_NAME@
101 ####################################################################
102
103-cmake_minimum_required(VERSION 2.6)
104+cmake_minimum_required(VERSION 3.16.3)
105 project(conio)
106
107 # find the falcon installation. Set CMAKE_INSTALL_PREFIX to the falcon root
108diff --git a/modules/native/curl/CMakeLists.txt b/modules/native/curl/CMakeLists.txt
109index 2f1e908e7..7d7a2377c 100644
110--- a/modules/native/curl/CMakeLists.txt
111+++ b/modules/native/curl/CMakeLists.txt
112@@ -4,7 +4,7 @@
113 # CMake configuration file for curl
114 ####################################################################
115
116-cmake_minimum_required(VERSION 2.6)
117+cmake_minimum_required(VERSION 3.16.3)
118 project(Falcon_curl)
119 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
120
121diff --git a/modules/native/dbi/CMakeLists.txt b/modules/native/dbi/CMakeLists.txt
122index 3a3f72c5f..20dbee902 100644
123--- a/modules/native/dbi/CMakeLists.txt
124+++ b/modules/native/dbi/CMakeLists.txt
125@@ -3,7 +3,7 @@
126 #
127 # CMake configuration file for DBI
128 ####################################################################
129-cmake_minimum_required(VERSION 2.6.2)
130+cmake_minimum_required(VERSION 3.16.3)
131 project(Falcon_DBI)
132
133 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
134diff --git a/modules/native/dbus/CMakeLists.txt b/modules/native/dbus/CMakeLists.txt
135index 4bd76ce38..09f575fa7 100644
136--- a/modules/native/dbus/CMakeLists.txt
137+++ b/modules/native/dbus/CMakeLists.txt
138@@ -5,7 +5,7 @@
139 ####################################################################
140
141 PROJECT(dbus)
142-cmake_minimum_required(VERSION 2.6)
143+cmake_minimum_required(VERSION 3.16.3)
144
145 INCLUDE( ${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)
146
147diff --git a/modules/native/dynlib/CMakeLists.txt b/modules/native/dynlib/CMakeLists.txt
148index 92bc09e59..6e1f31ec9 100644
149--- a/modules/native/dynlib/CMakeLists.txt
150+++ b/modules/native/dynlib/CMakeLists.txt
151@@ -4,7 +4,7 @@
152 # CMake configuration file for dynlib
153 ####################################################################
154
155-cmake_minimum_required(VERSION 2.6)
156+cmake_minimum_required(VERSION 3.16.3)
157 project(Falcon_dynlib)
158
159 find_package(Falcon REQUIRED)
160diff --git a/modules/native/feathers/CMakeLists.txt b/modules/native/feathers/CMakeLists.txt
161index 7be6dca12..3591a4b9a 100644
162--- a/modules/native/feathers/CMakeLists.txt
163+++ b/modules/native/feathers/CMakeLists.txt
164@@ -3,7 +3,7 @@
165 #
166 # CMake configuration file for Feather modules
167 ####################################################################
168-cmake_minimum_required(VERSION 2.6.2)
169+cmake_minimum_required(VERSION 3.16.3)
170 PROJECT(Falcon_Feathers)
171
172 # Find our Find*.cmake files
173diff --git a/modules/native/gd2/CMakeLists.txt b/modules/native/gd2/CMakeLists.txt
174index 7d775d1e7..73692d4fd 100644
175--- a/modules/native/gd2/CMakeLists.txt
176+++ b/modules/native/gd2/CMakeLists.txt
177@@ -5,7 +5,7 @@
178 ####################################################################
179
180 PROJECT(gd2)
181-cmake_minimum_required(VERSION 2.6)
182+cmake_minimum_required(VERSION 3.16.3)
183 MESSAGE(STATUS "Building GD2 module" )
184
185
186diff --git a/modules/native/gtk/CMakeLists.txt b/modules/native/gtk/CMakeLists.txt
187index 0f08e4bb3..f1bc647e9 100644
188--- a/modules/native/gtk/CMakeLists.txt
189+++ b/modules/native/gtk/CMakeLists.txt
190@@ -3,7 +3,7 @@
191 #
192 project( gtk )
193
194-cmake_minimum_required( VERSION 2.6.3 )
195+cmake_minimum_required( VERSION 3.16.3 )
196
197 list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
198
199diff --git a/modules/native/hpdf/CMakeLists.txt b/modules/native/hpdf/CMakeLists.txt
200index 679444146..cf86e9392 100644
201--- a/modules/native/hpdf/CMakeLists.txt
202+++ b/modules/native/hpdf/CMakeLists.txt
203@@ -4,7 +4,7 @@
204 # CMake configuration file for Feather modules
205 ####################################################################
206
207-cmake_minimum_required(VERSION 2.6)
208+cmake_minimum_required(VERSION 3.16.3)
209 project(falcon-module-hpdf)
210
211 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
212diff --git a/modules/native/sdl/CMakeLists.txt b/modules/native/sdl/CMakeLists.txt
213index 32a07dfd5..7d46ae513 100644
214--- a/modules/native/sdl/CMakeLists.txt
215+++ b/modules/native/sdl/CMakeLists.txt
216@@ -6,7 +6,7 @@
217 if(COMMAND cmake_policy)
218 cmake_policy(SET CMP0003 OLD)
219 endif(COMMAND cmake_policy)
220-cmake_minimum_required(VERSION 2.6)
221+cmake_minimum_required(VERSION 3.16.3)
222 PROJECT(Falcon_SDL)
223
224
225diff --git a/modules/native/wopi/CMakeLists.txt b/modules/native/wopi/CMakeLists.txt
226index 3f711cd6d..56e6c539b 100644
227--- a/modules/native/wopi/CMakeLists.txt
228+++ b/modules/native/wopi/CMakeLists.txt
229@@ -3,7 +3,7 @@
230 # Falcon Web Oriented Programming Interface
231 #
232
233-cmake_minimum_required(VERSION 2.6.2)
234+cmake_minimum_required(VERSION 3.16.3)
235 project( falcon_wopi )
236
237 ######################################################################
238diff --git a/tests/native/dynlib/CMakeLists.txt b/tests/native/dynlib/CMakeLists.txt
239index 1781380d9..ed3f1e99f 100644
240--- a/tests/native/dynlib/CMakeLists.txt
241+++ b/tests/native/dynlib/CMakeLists.txt
242@@ -3,7 +3,7 @@
243 #
244 # CMake configuration file for dynlib - TESTS
245 ####################################################################
246-cmake_minimum_required(VERSION 2.6)
247+cmake_minimum_required(VERSION 3.16.3)
248
249 include_directories(
250 ${CMAKE_CURRENT_SOURCE_DIR}