Skip to content

Commit

Permalink
[CMake] Update various cmake_minimum_required directives
Browse files Browse the repository at this point in the history
  • Loading branch information
past-due committed Sep 1, 2023
1 parent 665835d commit a29cd78
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .ci/flatpak/generate_flatpak_config.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

# Automatically generate a Flatpak manifest from the template file
#
Expand Down
2 changes: 1 addition & 1 deletion .ci/githubactions/prepare_git_repo.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.3)
cmake_minimum_required(VERSION 3.5...3.24)
cmake_policy(SET CMP0054 NEW)

# [preparegitrepo.cmake]
Expand Down
2 changes: 1 addition & 1 deletion build_tools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

############################
# Versioning (autorevision)
Expand Down
4 changes: 2 additions & 2 deletions build_tools/autorevision.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.3)
cmake_minimum_required(VERSION 3.5...3.24)
cmake_policy(SET CMP0054 NEW)

# [Autorevision.cmake]
Expand All @@ -9,7 +9,7 @@ cmake_policy(SET CMP0054 NEW)
# COPYING.md for licence terms.
#
# autorevision.CMake:
# Copyright © 2018-2021 pastdue ( https://github.com/past-due/ ) and contributors
# Copyright © 2018-2023 pastdue ( https://github.com/past-due/ ) and contributors
# License: MIT License ( https://opensource.org/licenses/MIT )
#
#
Expand Down
2 changes: 1 addition & 1 deletion build_tools/autorevision_helpers.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.3)
cmake_minimum_required(VERSION 3.5...3.24)
cmake_policy(SET CMP0054 NEW)

# Provides functions for:
Expand Down
6 changes: 3 additions & 3 deletions cmake/CheckCompilerFlagsOutput.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#
# Copyright © 2018 pastdue ( https://github.com/past-due/ ) and contributors
# Copyright © 2018-2023 pastdue ( https://github.com/past-due/ ) and contributors
# License: MIT License ( https://opensource.org/licenses/MIT )
#
# Script Version: 2018-07-08a
# Script Version: 2023-09-01a
#

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
Expand Down
2 changes: 1 addition & 1 deletion cmake/DisallowInSourceBuilds.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

function(DisallowInSourceBuilds)
get_filename_component(_real_source_dir "${CMAKE_SOURCE_DIR}" REALPATH)
Expand Down
6 changes: 3 additions & 3 deletions cmake/FindZIP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# specifying various options. COMPRESS_ZIP supports all of the above detected ZIP_EXECUTABLE possibilities.
#
#
# Copyright © 2018-2020 pastdue ( https://github.com/past-due/ ) and contributors
# Copyright © 2018-2023 pastdue ( https://github.com/past-due/ ) and contributors
# License: MIT License ( https://opensource.org/licenses/MIT )
#
# Script Version: 2020-06-03b
# Script Version: 2023-09-01a
#

cmake_minimum_required(VERSION 3.3)
cmake_minimum_required(VERSION 3.5...3.24)

set(_PF32BIT "ProgramFiles(x86)")

Expand Down
2 changes: 1 addition & 1 deletion icons/autorevision_metainfo.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

# Automatically update the Release and other info in the net.wz2100.warzone2100.appdata.xml.in file
#
Expand Down
2 changes: 1 addition & 1 deletion lib/netplay/autorevision_netplay.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

# Automatically update the NETCODE_VERSION in the netplay_config.h file
#
Expand Down
2 changes: 1 addition & 1 deletion pkg/CPackConfigVersion.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)
cmake_policy(SET CMP0054 NEW)

execute_process(COMMAND ${CMAKE_COMMAND} -E echo "+Executing CPackConfigVersion.cmake")
Expand Down
2 changes: 1 addition & 1 deletion pkg/autorevisionForSourcePackage.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

# Runs autorevision to copy autorevision.cache to the source package
# (it should not be copied to binary package).
Expand Down
2 changes: 1 addition & 1 deletion po/WZ_build_po_template.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

# Build the warzone2100.pot default language file
# from the files listed in POTFILES.in
Expand Down
2 changes: 1 addition & 1 deletion src/integrations/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.24)

##################################################
# WZ Discord RPC support
Expand Down

0 comments on commit a29cd78

Please sign in to comment.