Skip to content

Commit 965d69d

Browse files
committed
CMake: Bump minimum version to 3.17.
CPack's External generator was already a 3.13 feature. 3.17 is picked for CMP0099 by default. The version is set as a range, so hopefully we have a decade or two before the next deprecation warning.
1 parent d2314a2 commit 965d69d

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

.github/workflows/continuous_integration.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
-A x64
3030
-DCMAKE_TOOLCHAIN_FILE="${env:VCPKG_INSTALLATION_ROOT}\scripts\buildsystems\vcpkg.cmake"
3131
-DVCPKG_TARGET_TRIPLET=x64-windows-static-release
32-
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW
3332
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
3433
-DCMAKE_IGNORE_PATH="C:/Strawberry/perl/bin;C:/Strawberry/c/lib"
3534

prboom2/CMakeLists.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.9)
1+
cmake_minimum_required(VERSION 3.17...4.0)
22

33
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
44

@@ -18,20 +18,10 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1818
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
1919
endif()
2020

21-
if(POLICY CMP0099)
22-
cmake_policy(SET CMP0099 NEW)
23-
else()
24-
message(WARNING "Your version of CMake is very old. This may cause linking issues if your dependencies are not in your compiler's default search paths.")
25-
endif()
26-
2721
if(VCPKG_TOOLCHAIN)
2822
set(ENV{PKG_CONFIG_PATH} "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/pkgconfig")
2923
endif()
3024

31-
if(POLICY CMP0069)
32-
cmake_policy(SET CMP0069 NEW)
33-
endif()
34-
3525
set(PROJECT_TARNAME "dsda-doom")
3626
set(WAD_DATA "dsda-doom.wad")
3727
set(PROJECT_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")

0 commit comments

Comments
 (0)