Skip to content

Commit

Permalink
cmake: bump version requirement to 3.16.3
Browse files Browse the repository at this point in the history
- 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)
  • Loading branch information
benoit-pierre authored and Frenzie committed Dec 29, 2024
1 parent cd63c69 commit 81fd2e9
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
2 changes: 1 addition & 1 deletion Makefile.defs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/czmq/cmake_tweaks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/giflib/overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15)
cmake_minimum_required(VERSION 3.16.3)
project(giflib LANGUAGES C)

add_library(gif)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/kpvcrlib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/leptonica/cmake_tweaks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
2 changes: 1 addition & 1 deletion thirdparty/libzmq/cmake_tweaks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/lodepng/overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/lpeg/overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/luasec/overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/luasocket/overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/md4c/cmake_tweaks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion thirdparty/minizip/overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/popen-noshell/overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/sdl2/appimage.patch
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/sdl2/cmake_tweaks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion thirdparty/tesseract/cmake_tweaks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/turbo/overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 81fd2e9

Please sign in to comment.