rpms/warzone2100
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
warzone2100/cmake4.patch
Gwyn Ciesla a267a28b39 Fix FTBFS
2025-08-14 08:08:05 -05:00

521 lines
25 KiB
Diff
Raw Permalink Blame History

diff -U3 -r warzone2100.old/3rdparty/basis_universal/CMakeLists.txt warzone2100/3rdparty/basis_universal/CMakeLists.txt
--- warzone2100.old/3rdparty/basis_universal/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600
+++ warzone2100/3rdparty/basis_universal/CMakeLists.txt 2025-08-13 14:49:48.825317535 -0500
@@ -1,6 +1,6 @@
project(basisu)
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12...4.0)
option(STATIC "static linking" FALSE)
option(SAN "sanitize" FALSE)
diff -U3 -r warzone2100.old/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt warzone2100/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt
--- warzone2100.old/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600
+++ warzone2100/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt 2025-08-13 14:49:48.825112521 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12...4.0)
project(basisu_encoder_js)
diff -U3 -r warzone2100.old/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt warzone2100/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt
--- warzone2100.old/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600
+++ warzone2100/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt 2025-08-13 14:49:48.824916527 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12...4.0)
project(basisu_transcoder_js)
diff -U3 -r warzone2100.old/3rdparty/basis_universal_host_build/CMakeLists.txt warzone2100/3rdparty/basis_universal_host_build/CMakeLists.txt
--- warzone2100.old/3rdparty/basis_universal_host_build/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/3rdparty/basis_universal_host_build/CMakeLists.txt 2025-08-13 14:49:48.827655139 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12...4.0)
project(basis_universal_host_build_wrapper)
set(BASIS_UNIVERSAL_SRC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../basis_universal")
diff -U3 -r warzone2100.old/3rdparty/CMakeLists.txt warzone2100/3rdparty/CMakeLists.txt
--- warzone2100.old/3rdparty/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/3rdparty/CMakeLists.txt 2025-08-13 14:49:48.827852856 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5...3.24)
+cmake_minimum_required(VERSION 3.12...4.0)
include(CheckCompilerFlagsOutput)
diff -U3 -r warzone2100.old/3rdparty/date/CMakeLists.txt warzone2100/3rdparty/date/CMakeLists.txt
--- warzone2100.old/3rdparty/date/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600
+++ warzone2100/3rdparty/date/CMakeLists.txt 2025-08-13 14:49:48.826956569 -0500
@@ -15,7 +15,7 @@
#]===================================================================]
-cmake_minimum_required( VERSION 3.7 )
+cmake_minimum_required(VERSION 3.12...4.0)
project( date VERSION 3.0.1 )
set(ABI_VERSION 3) # used as SOVERSION, increment when ABI changes
diff -U3 -r warzone2100.old/3rdparty/discord-rpc/CMakeLists.txt warzone2100/3rdparty/discord-rpc/CMakeLists.txt
--- warzone2100.old/3rdparty/discord-rpc/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600
+++ warzone2100/3rdparty/discord-rpc/CMakeLists.txt 2025-08-13 14:49:48.822365594 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2...3.14)
+cmake_minimum_required(VERSION 3.12...4.0)
project (DiscordRPC)
include(GNUInstallDirs)
diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt
--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt 2024-11-13 13:54:54.000000000 -0600
+++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt 2025-08-13 14:49:48.823698588 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.12...4.0)
if(POLICY CMP0054)
cmake_policy(SET CMP0054 NEW)
diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt
--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600
+++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt 2025-08-13 14:49:48.823017794 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 3.12...4.0)
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt
--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600
+++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt 2025-08-13 14:49:48.822648901 -0500
@@ -43,7 +43,7 @@
cmake_policy(SET CMP0048 NEW)
project(gmock VERSION 1.9.0 LANGUAGES CXX C)
endif()
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 3.12...4.0)
if (COMMAND set_up_hermetic_build)
set_up_hermetic_build()
diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt
--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600
+++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt 2025-08-13 14:49:48.823285576 -0500
@@ -50,7 +50,7 @@
cmake_policy(SET CMP0048 NEW)
project(gtest VERSION 1.9.0 LANGUAGES CXX C)
endif()
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 3.12...4.0)
if (POLICY CMP0063) # Visibility
cmake_policy(SET CMP0063 NEW)
diff -U3 -r warzone2100.old/3rdparty/EmbeddedJSONSignature/CMakeLists.txt warzone2100/3rdparty/EmbeddedJSONSignature/CMakeLists.txt
--- warzone2100.old/3rdparty/EmbeddedJSONSignature/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600
+++ warzone2100/3rdparty/EmbeddedJSONSignature/CMakeLists.txt 2025-08-13 14:49:48.828146769 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.12...4.0)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
diff -U3 -r warzone2100.old/3rdparty/expected/CMakeLists.txt warzone2100/3rdparty/expected/CMakeLists.txt
--- warzone2100.old/3rdparty/expected/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/expected/CMakeLists.txt 2025-08-13 14:49:48.824170255 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.12...4.0)
project(tl-expected
HOMEPAGE_URL https://tl.tartanllama.xyz
DESCRIPTION "C++11/14/17 std::expected with functional-style extensions"
diff -U3 -r warzone2100.old/3rdparty/fmt/CMakeLists.txt warzone2100/3rdparty/fmt/CMakeLists.txt
--- warzone2100.old/3rdparty/fmt/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/fmt/CMakeLists.txt 2025-08-13 14:49:48.826660907 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8...3.26)
+cmake_minimum_required(VERSION 3.12...4.0)
# Fallback for using newer policies on CMake <3.12.
if (${CMAKE_VERSION} VERSION_LESS 3.12)
diff -U3 -r warzone2100.old/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt
--- warzone2100.old/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt 2025-08-13 14:49:48.826180621 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8...3.25)
+cmake_minimum_required(VERSION 3.12...4.0)
project(fmt-test CXX)
diff -U3 -r warzone2100.old/3rdparty/fmt/test/compile-error-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/compile-error-test/CMakeLists.txt
--- warzone2100.old/3rdparty/fmt/test/compile-error-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/fmt/test/compile-error-test/CMakeLists.txt 2025-08-13 14:49:48.825980269 -0500
@@ -1,6 +1,6 @@
# Test if compile errors are produced where necessary.
-cmake_minimum_required(VERSION 3.8...3.25)
+cmake_minimum_required(VERSION 3.12...4.0)
project(compile-error-test CXX)
set(fmt_headers "
@@ -64,7 +64,7 @@
")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test/CMakeLists.txt" "
- cmake_minimum_required(VERSION 3.8...3.25)
+cmake_minimum_required(VERSION 3.12...4.0)
project(tests CXX)
add_subdirectory(${FMT_DIR} fmt)
${cmake_targets}
diff -U3 -r warzone2100.old/3rdparty/fmt/test/find-package-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/find-package-test/CMakeLists.txt
--- warzone2100.old/3rdparty/fmt/test/find-package-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/fmt/test/find-package-test/CMakeLists.txt 2025-08-13 14:49:48.825763077 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8...3.25)
+cmake_minimum_required(VERSION 3.12...4.0)
project(fmt-test)
diff -U3 -r warzone2100.old/3rdparty/fmt/test/static-export-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/static-export-test/CMakeLists.txt
--- warzone2100.old/3rdparty/fmt/test/static-export-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/fmt/test/static-export-test/CMakeLists.txt 2025-08-13 14:49:48.826355603 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8...3.25)
+cmake_minimum_required(VERSION 3.12...4.0)
project(fmt-link CXX)
diff -U3 -r warzone2100.old/3rdparty/glm/CMakeLists.txt warzone2100/3rdparty/glm/CMakeLists.txt
--- warzone2100.old/3rdparty/glm/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/glm/CMakeLists.txt 2025-08-13 14:49:48.827382757 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12...4.0)
cmake_policy(VERSION 3.6)
file(READ "glm/detail/setup.hpp" GLM_SETUP_FILE)
diff -U3 -r warzone2100.old/3rdparty/glm/test/cmake/CMakeLists.txt warzone2100/3rdparty/glm/test/cmake/CMakeLists.txt
--- warzone2100.old/3rdparty/glm/test/cmake/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/glm/test/cmake/CMakeLists.txt 2025-08-13 14:49:48.827186410 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12...4.0)
cmake_policy(VERSION 3.6)
project(test_find_glm)
diff -U3 -r warzone2100.old/3rdparty/json/CMakeLists.txt warzone2100/3rdparty/json/CMakeLists.txt
--- warzone2100.old/3rdparty/json/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/3rdparty/json/CMakeLists.txt 2025-08-13 14:49:48.823963491 -0500
@@ -1,6 +1,6 @@
# A simplified version of: https://github.com/nlohmann/json/blob/b21c34517900c46a943c804d9af3a20cd0c77062/CMakeLists.txt
-cmake_minimum_required(VERSION 3.1...3.14)
+cmake_minimum_required(VERSION 3.12...4.0)
project(nlohmann_json LANGUAGES CXX)
diff -U3 -r warzone2100.old/3rdparty/launchinfo/CMakeLists.txt warzone2100/3rdparty/launchinfo/CMakeLists.txt
--- warzone2100.old/3rdparty/launchinfo/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/launchinfo/CMakeLists.txt 2025-08-13 14:49:48.830539650 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.12...4.0)
project (launchinfo C CXX)
file(GLOB HEADERS "include/LaunchInfo.h")
diff -U3 -r warzone2100.old/3rdparty/libplum/CMakeLists.txt warzone2100/3rdparty/libplum/CMakeLists.txt
--- warzone2100.old/3rdparty/libplum/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/libplum/CMakeLists.txt 2025-08-13 14:49:48.830345294 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.7)
+cmake_minimum_required(VERSION 3.12...4.0)
project (libplum
VERSION 0.4.0
LANGUAGES C)
diff -U3 -r warzone2100.old/3rdparty/optional-lite/CMakeLists.txt warzone2100/3rdparty/optional-lite/CMakeLists.txt
--- warzone2100.old/3rdparty/optional-lite/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/3rdparty/optional-lite/CMakeLists.txt 2025-08-13 14:49:48.825564157 -0500
@@ -1,6 +1,6 @@
# A very simple version of: https://github.com/martinmoene/optional-lite/blob/master/CMakeLists.txt
-cmake_minimum_required(VERSION 3.5...3.24)
+cmake_minimum_required(VERSION 3.12...4.0)
project(
optional_lite
diff -U3 -r warzone2100.old/3rdparty/quickjs-wz/CMakeLists.txt warzone2100/3rdparty/quickjs-wz/CMakeLists.txt
--- warzone2100.old/3rdparty/quickjs-wz/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/quickjs-wz/CMakeLists.txt 2025-08-13 14:49:48.824391310 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5...3.14)
+cmake_minimum_required(VERSION 3.12...4.0)
project (quickjs C)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
diff -U3 -r warzone2100.old/3rdparty/re2/CMakeLists.txt warzone2100/3rdparty/re2/CMakeLists.txt
--- warzone2100.old/3rdparty/re2/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/re2/CMakeLists.txt 2025-08-13 14:49:48.822044500 -0500
@@ -4,7 +4,7 @@
# Old enough to support Ubuntu Bionic,
# but just the MAJOR.MINOR components.
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12...4.0)
project(RE2 CXX)
include(CMakePackageConfigHelpers)
diff -U3 -r warzone2100.old/3rdparty/readerwriterqueue/CMakeLists.txt warzone2100/3rdparty/readerwriterqueue/CMakeLists.txt
--- warzone2100.old/3rdparty/readerwriterqueue/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/readerwriterqueue/CMakeLists.txt 2025-08-13 14:49:48.828316645 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.12...4.0)
project(readerwriterqueue VERSION 1.0.0)
include(GNUInstallDirs)
diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt
--- warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600
+++ warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt 2025-08-13 14:49:48.829206089 -0500
@@ -4,7 +4,7 @@
#
# Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
# or copy at http://opensource.org/licenses/MIT)
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12...4.0)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # custom CMake modules like FindSQLiteCpp
project(SQLiteCpp VERSION 3.3.1)
diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt
--- warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600
+++ warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2025-08-13 14:49:48.829010729 -0500
@@ -4,7 +4,7 @@
#
# Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
# or copy at http://opensource.org/licenses/MIT)
-cmake_minimum_required(VERSION 3.1) # for "CMAKE_CXX_STANDARD" version
+cmake_minimum_required(VERSION 3.12...4.0)
project(SQLiteCpp_Example VERSION 2.0)
# SQLiteC++ 3.x now requires C++11 compiler
diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/CMakeLists.txt
--- warzone2100.old/3rdparty/SQLiteCpp/googletest/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600
+++ warzone2100/3rdparty/SQLiteCpp/googletest/CMakeLists.txt 2025-08-13 14:49:48.829897152 -0500
@@ -1,7 +1,7 @@
# Note: CMake support is community-based. The maintainers do not use CMake
# internally.
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.12...4.0)
project(googletest-distribution)
set(GOOGLETEST_VERSION 1.14.0)
diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt
--- warzone2100.old/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600
+++ warzone2100/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt 2025-08-13 14:49:48.829669555 -0500
@@ -36,7 +36,7 @@
# as ${gmock_SOURCE_DIR} and to the root binary directory as
# ${gmock_BINARY_DIR}.
# Language "C" is required for find_package(Threads).
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.12...4.0)
project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
if (COMMAND set_up_hermetic_build)
diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt
--- warzone2100.old/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600
+++ warzone2100/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt 2025-08-13 14:49:48.830060677 -0500
@@ -46,7 +46,7 @@
# Project version:
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.12...4.0)
project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
if (COMMAND set_up_hermetic_build)
diff -U3 -r warzone2100.old/3rdparty/utf8proc/CMakeLists.txt warzone2100/3rdparty/utf8proc/CMakeLists.txt
--- warzone2100.old/3rdparty/utf8proc/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/utf8proc/CMakeLists.txt 2025-08-13 14:49:48.824650163 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.12...4.0)
include (utils.cmake)
diff -U3 -r warzone2100.old/3rdparty/utfcpp/CMakeLists.txt warzone2100/3rdparty/utfcpp/CMakeLists.txt
--- warzone2100.old/3rdparty/utfcpp/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/utfcpp/CMakeLists.txt 2025-08-13 14:49:48.828870000 -0500
@@ -1,7 +1,7 @@
# This file is deprecated and will be removed in a future release
# Please see the instructions for installation in README.md file
-cmake_minimum_required (VERSION 3.14...3.27)
+cmake_minimum_required(VERSION 3.12...4.0)
project (utf8cpp
VERSION 4.0.4
LANGUAGES CXX
diff -U3 -r warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt
--- warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2025-08-13 14:49:48.828480707 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.12...4.0)
project (ftest VERSION 0.0.1 LANGUAGES CXX)
enable_testing()
diff -U3 -r warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt
--- warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt 2025-08-13 14:49:48.828685840 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.12...4.0)
project(utfcpptests LANGUAGES CXX)
enable_testing()
diff -U3 -r warzone2100.old/build_tools/CMakeLists.txt warzone2100/build_tools/CMakeLists.txt
--- warzone2100.old/build_tools/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/build_tools/CMakeLists.txt 2025-08-13 14:49:48.832806206 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5...3.24)
+cmake_minimum_required(VERSION 3.12...4.0)
############################
# Versioning (autorevision)
diff -U3 -r warzone2100.old/CMakeLists.txt warzone2100/CMakeLists.txt
--- warzone2100.old/CMakeLists.txt 2025-08-13 14:48:22.252967002 -0500
+++ warzone2100/CMakeLists.txt 2025-08-13 14:49:48.832964528 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5...3.24)
+cmake_minimum_required(VERSION 3.12...4.0)
set(_OLD_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
diff -U3 -r warzone2100.old/data/fonts/CMakeLists.txt warzone2100/data/fonts/CMakeLists.txt
--- warzone2100.old/data/fonts/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600
+++ warzone2100/data/fonts/CMakeLists.txt 2025-08-13 14:49:48.831038582 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required(VERSION 3.12...4.0)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/DejaVu/LICENSE"
diff -U3 -r warzone2100.old/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt warzone2100/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt
--- warzone2100.old/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600
+++ warzone2100/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt 2025-08-13 14:49:48.831256841 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12...4.0)
project (miniupnpc
VERSION 2.2.8
diff -U3 -r warzone2100.old/lib/sound/3rdparty/opusfile/CMakeLists.txt warzone2100/lib/sound/3rdparty/opusfile/CMakeLists.txt
--- warzone2100.old/lib/sound/3rdparty/opusfile/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600
+++ warzone2100/lib/sound/3rdparty/opusfile/CMakeLists.txt 2025-08-13 14:49:48.831857223 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.12...4.0)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
diff -U3 -r warzone2100.old/lib/wzmaplib/CMakeLists.txt warzone2100/lib/wzmaplib/CMakeLists.txt
--- warzone2100.old/lib/wzmaplib/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/lib/wzmaplib/CMakeLists.txt 2025-08-13 14:49:48.831615733 -0500
@@ -22,7 +22,7 @@
##############################
# wzmaplib project
-cmake_minimum_required(VERSION ${_cmake_min_ver_supported}...3.24)
+cmake_minimum_required(VERSION 3.12...4.0)
project (wzmaplib CXX)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
diff -U3 -r warzone2100.old/po/CMakeLists.txt warzone2100/po/CMakeLists.txt
--- warzone2100.old/po/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/po/CMakeLists.txt 2025-08-13 14:49:48.830713731 -0500
@@ -15,7 +15,7 @@
# CMake 3.10+ at the top of this file leads to an inability to compile via
# Visual Studio itself.
#
- # Instead of using cmake_minimum_required(VERSION 3.10), detect the
+cmake_minimum_required(VERSION 3.12...4.0)
# CMake version and emit a warning if it's below 3.10.
#
if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
diff -U3 -r warzone2100.old/src/integrations/CMakeLists.txt warzone2100/src/integrations/CMakeLists.txt
--- warzone2100.old/src/integrations/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/src/integrations/CMakeLists.txt 2025-08-13 14:49:48.832121148 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5...3.24)
+cmake_minimum_required(VERSION 3.12...4.0)
##################################################
# WZ Discord RPC support
diff -U3 -r warzone2100.old/tools/map/old/CMakeLists.txt warzone2100/tools/map/old/CMakeLists.txt
--- warzone2100.old/tools/map/old/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/tools/map/old/CMakeLists.txt 2025-08-13 14:49:48.832305121 -0500
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required(VERSION 3.12...4.0)
project (maptools)
diff -U3 -r warzone2100.old/tools/maptools-cli/CMakeLists.txt warzone2100/tools/maptools-cli/CMakeLists.txt
--- warzone2100.old/tools/maptools-cli/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600
+++ warzone2100/tools/maptools-cli/CMakeLists.txt 2025-08-13 14:49:48.832560376 -0500
@@ -7,7 +7,7 @@
set(_cmake_min_ver_supported 3.11) # CMake 3.11 is the minimum version for FetchContent
endif()
-cmake_minimum_required(VERSION ${_cmake_min_ver_supported}...3.14)
+cmake_minimum_required(VERSION 3.12...4.0)
set(_OLD_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
--- warzone2100/doc/CMakeLists.txt~ 2024-11-13 13:54:24.000000000 -0600
+++ warzone2100/doc/CMakeLists.txt 2025-08-13 15:12:41.371983496 -0500
@@ -16,6 +16,7 @@
COMMAND ${CMAKE_COMMAND} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/GenerateJSDocs.cmake
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
VERBATIM
+ POST_BUILD
)
configure_file(Scripting.md "${CMAKE_CURRENT_BINARY_DIR}/Scripting.md" COPYONLY)
--- warzone2100/doc/CMakeLists.txt~ 2025-08-13 15:23:14.837051821 -0500
+++ warzone2100/doc/CMakeLists.txt 2025-08-13 15:25:02.458759347 -0500
@@ -131,6 +131,7 @@
-a toc
${CMAKE_CURRENT_BINARY_DIR}/quickstartguide.asciidoc
VERBATIM
+ POST_BUILD
)
configure_file("warzone2100.6.asciidoc" "${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc" COPYONLY)
@@ -146,6 +147,7 @@
-D ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc
VERBATIM
+ POST_BUILD
)
# warzone2100.6 - man-page format
@@ -160,6 +162,7 @@
-o warzone2100.6
${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc
VERBATIM
+ POST_BUILD
)
unset(_asciidoctor_option_failurelevel)
@@ -270,12 +273,14 @@
COMMAND ${CMAKE_COMMAND} -E copy "${_warzone2100_6_uncompressed_orig}" "${_warzone2100_6_uncompressed}"
COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed}
VERBATIM
+ POST_BUILD
)
else()
add_custom_command(
TARGET wz2100_manpages
COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed}
VERBATIM
+ POST_BUILD
)
endif()
Reference in a new issue View git blame Copy permalink