cmake: bump version requirement to 3.16.3

benoit-pierre · benoit-pierre · commit 1eb8d8f761f0 · 2024-12-16T23:29:42.000+01:00
- this is the version used by our Docker images
- LibreSSL needs at least 3.16.4 (which should be safely downgradable to 3.16.3)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(koreader LANGUAGES C CXX)
 
 include(${CMAKE_KOVARS})
diff --git a/Makefile.defs b/Makefile.defs
@@ -802,7 +802,7 @@ endif
 # Native & cross definitions.
 define cmake_toolchain
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 
 # CMake Cross ToolChain config file. Adapted from Debian's dpkg-cross ;).
 # c.f., https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-toolchain
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(koreader-base LANGUAGES C CXX)
 
 include(CheckFunctionExists)
diff --git a/thirdparty/czmq/cmake_tweaks.patch b/thirdparty/czmq/cmake_tweaks.patch
@@ -5,7 +5,7 @@
  # Project setup
  ########################################################################
 -cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.15)
++cmake_minimum_required(VERSION 3.16.3)
  project(czmq)
  enable_language(C)
  enable_testing()
diff --git a/thirdparty/giflib/overlay/CMakeLists.txt b/thirdparty/giflib/overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(giflib LANGUAGES C)
 
 add_library(gif)
diff --git a/thirdparty/kpvcrlib/CMakeLists.txt b/thirdparty/kpvcrlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(koreader LANGUAGES C CXX)
 
 include(${CMAKE_KOVARS})
diff --git a/thirdparty/leptonica/cmake_tweaks.patch b/thirdparty/leptonica/cmake_tweaks.patch
@@ -6,7 +6,7 @@
  
 -cmake_minimum_required(VERSION 3.5)
 -cmake_policy(SET CMP0054 NEW)
-+cmake_minimum_required(VERSION 3.15)
++cmake_minimum_required(VERSION 3.16.3)
  
  # In-source builds are disabled.
  if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/thirdparty/libzmq/cmake_tweaks.patch b/thirdparty/libzmq/cmake_tweaks.patch
@@ -5,7 +5,7 @@
  
  if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
 -  cmake_minimum_required(VERSION 3.0.2)
-+  cmake_minimum_required(VERSION 3.15)
++  cmake_minimum_required(VERSION 3.16.3)
  else()
 -  cmake_minimum_required(VERSION 2.8.12)
 +  cmake_minimum_required(VERSION 2.15)
diff --git a/thirdparty/lodepng/overlay/CMakeLists.txt b/thirdparty/lodepng/overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(lodepng LANGUAGES C)
 
 file(WRITE lodepng.c "#include \"lodepng.cpp\"\n")
diff --git a/thirdparty/lpeg/overlay/CMakeLists.txt b/thirdparty/lpeg/overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(lpeg LANGUAGES C)
 
 find_package(PkgConfig REQUIRED)
diff --git a/thirdparty/luasec/overlay/CMakeLists.txt b/thirdparty/luasec/overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(luasec LANGUAGES C)
 
 find_package(OpenSSL REQUIRED)
diff --git a/thirdparty/luasocket/overlay/CMakeLists.txt b/thirdparty/luasocket/overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(luasocket LANGUAGES C)
 
 find_package(PkgConfig REQUIRED)
diff --git a/thirdparty/md4c/cmake_tweaks.patch b/thirdparty/md4c/cmake_tweaks.patch
@@ -3,7 +3,7 @@
 @@ -1,5 +1,5 @@
  
 -cmake_minimum_required(VERSION 3.5)
-+cmake_minimum_required(VERSION 3.15)
++cmake_minimum_required(VERSION 3.16.3)
  project(MD4C C)
  
  set(MD_VERSION_MAJOR 0)
diff --git a/thirdparty/minizip/overlay/CMakeLists.txt b/thirdparty/minizip/overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(minizip LANGUAGES C)
 
 file(GLOB AES_SRC aes/*.c)
diff --git a/thirdparty/popen-noshell/overlay/CMakeLists.txt b/thirdparty/popen-noshell/overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(popen-noshell LANGUAGES C)
 
 add_library(popen_noshell STATIC popen_noshell.c)
diff --git a/thirdparty/sdl2/appimage.patch b/thirdparty/sdl2/appimage.patch
@@ -1,7 +1,7 @@
 --- i/CMakeLists.txt
 +++ w/CMakeLists.txt
 @@ -8,6 +8,13 @@
- cmake_minimum_required(VERSION 3.15)
+ cmake_minimum_required(VERSION 3.16.3)
  project(SDL2 C CXX)
  
 +execute_process(COMMAND pkg-config --variable pc_path pkg-config RESULT_VARIABLE RET OUTPUT_VARIABLE OUT OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/thirdparty/sdl2/cmake_tweaks.patch b/thirdparty/sdl2/cmake_tweaks.patch
@@ -5,7 +5,7 @@
  set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
  
 -cmake_minimum_required(VERSION 3.0.0...3.5)
-+cmake_minimum_required(VERSION 3.15)
++cmake_minimum_required(VERSION 3.16.3)
  project(SDL2 C CXX)
  
  execute_process(COMMAND pkg-config --variable pc_path pkg-config RESULT_VARIABLE RET OUTPUT_VARIABLE OUT OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/thirdparty/tesseract/cmake_tweaks.patch b/thirdparty/tesseract/cmake_tweaks.patch
@@ -5,7 +5,7 @@
  # ##############################################################################
  
 -cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
  
  # In-source builds are disabled.
  if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/thirdparty/turbo/overlay/CMakeLists.txt b/thirdparty/turbo/overlay/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16.3)
 project(turbo LANGUAGES C)
 
 find_package(OpenSSL REQUIRED)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.15)`
	`1`	`+cmake_minimum_required(VERSION 3.16.3)`
`2`	`2`	`project(koreader LANGUAGES C CXX)`
`3`	`3`
`4`	`4`	`include(${CMAKE_KOVARS})`