From 351e0d7ed9d08d275d7b2c0423de5c6661a5446b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 3 Sep 2023 09:04:17 +0200 Subject: [PATCH] - removed obsolete CMake version requirements. Most were still at 3.1 which prompts noisy warnings from up-to-date CMake versions. Version requirements have been removed entirely from dependent subprojects, all others were upped to 3.16. --- libraries/asmjit/CMakeLists.txt | 2 -- libraries/bzip2/CMakeLists.txt | 2 -- libraries/discordrpc/CMakeLists.txt | 1 - libraries/lzma/CMakeLists.txt | 2 -- libraries/zlib/CMakeLists.txt | 1 - tools/CMakeLists.txt | 2 +- tools/lemon/CMakeLists.txt | 2 +- tools/re2c/CMakeLists.txt | 2 +- tools/zipdir/CMakeLists.txt | 2 +- wadsrc/CMakeLists.txt | 2 -- wadsrc_bm/CMakeLists.txt | 2 -- wadsrc_extra/CMakeLists.txt | 2 -- wadsrc_lights/CMakeLists.txt | 2 -- wadsrc_widepix/CMakeLists.txt | 2 -- 14 files changed, 4 insertions(+), 22 deletions(-) diff --git a/libraries/asmjit/CMakeLists.txt b/libraries/asmjit/CMakeLists.txt index 283b54fbc..4167e4c33 100644 --- a/libraries/asmjit/CMakeLists.txt +++ b/libraries/asmjit/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required( VERSION 3.1.0 ) - #make_release_only() project(asmjit C) diff --git a/libraries/bzip2/CMakeLists.txt b/libraries/bzip2/CMakeLists.txt index 452954c8a..846db25c2 100644 --- a/libraries/bzip2/CMakeLists.txt +++ b/libraries/bzip2/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required( VERSION 3.1.0 ) - make_release_only() if (MSVC) diff --git a/libraries/discordrpc/CMakeLists.txt b/libraries/discordrpc/CMakeLists.txt index a369a7dc1..2c417721a 100644 --- a/libraries/discordrpc/CMakeLists.txt +++ b/libraries/discordrpc/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required (VERSION 3.2.0) project (DiscordRPC) include(GNUInstallDirs) diff --git a/libraries/lzma/CMakeLists.txt b/libraries/lzma/CMakeLists.txt index 2ef5b078f..462419226 100644 --- a/libraries/lzma/CMakeLists.txt +++ b/libraries/lzma/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required( VERSION 3.1.0 ) - make_release_only() set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_PPMD_SUPPPORT" ) diff --git a/libraries/zlib/CMakeLists.txt b/libraries/zlib/CMakeLists.txt index 14f0175f6..22c2d5117 100644 --- a/libraries/zlib/CMakeLists.txt +++ b/libraries/zlib/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required( VERSION 3.1.0 ) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) make_release_only() diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 8725c56e8..25f4d243c 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 3.1.0 ) +cmake_minimum_required( VERSION 3.16 ) add_subdirectory( re2c ) add_subdirectory( lemon ) diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt index 71418eda5..a4da050b3 100644 --- a/tools/lemon/CMakeLists.txt +++ b/tools/lemon/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 3.1.0 ) +cmake_minimum_required( VERSION 3.16 ) if( NOT CMAKE_CROSSCOMPILING ) set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" ) diff --git a/tools/re2c/CMakeLists.txt b/tools/re2c/CMakeLists.txt index 9fcfef5a2..6b888773c 100644 --- a/tools/re2c/CMakeLists.txt +++ b/tools/re2c/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 3.1.0 ) +cmake_minimum_required( VERSION 3.16 ) if( NOT CMAKE_CROSSCOMPILING ) diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt index 762d9027f..17c3af223 100644 --- a/tools/zipdir/CMakeLists.txt +++ b/tools/zipdir/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 3.1.0 ) +cmake_minimum_required( VERSION 3.16 ) if( NOT CMAKE_CROSSCOMPILING ) include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) diff --git a/wadsrc/CMakeLists.txt b/wadsrc/CMakeLists.txt index 9e4393864..5128f20a0 100644 --- a/wadsrc/CMakeLists.txt +++ b/wadsrc/CMakeLists.txt @@ -1,3 +1 @@ -cmake_minimum_required( VERSION 3.1.0 ) - add_pk3(gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static) diff --git a/wadsrc_bm/CMakeLists.txt b/wadsrc_bm/CMakeLists.txt index e0268d1a3..639c33144 100644 --- a/wadsrc_bm/CMakeLists.txt +++ b/wadsrc_bm/CMakeLists.txt @@ -1,3 +1 @@ -cmake_minimum_required( VERSION 3.1.0 ) - add_pk3(brightmaps.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static) diff --git a/wadsrc_extra/CMakeLists.txt b/wadsrc_extra/CMakeLists.txt index d9a1b272f..964a177c6 100644 --- a/wadsrc_extra/CMakeLists.txt +++ b/wadsrc_extra/CMakeLists.txt @@ -1,3 +1 @@ -cmake_minimum_required( VERSION 3.1.0 ) - add_pk3(game_support.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static) diff --git a/wadsrc_lights/CMakeLists.txt b/wadsrc_lights/CMakeLists.txt index 4f9d87d7c..57a493dcd 100644 --- a/wadsrc_lights/CMakeLists.txt +++ b/wadsrc_lights/CMakeLists.txt @@ -1,3 +1 @@ -cmake_minimum_required( VERSION 3.1.0 ) - add_pk3(lights.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static) diff --git a/wadsrc_widepix/CMakeLists.txt b/wadsrc_widepix/CMakeLists.txt index 83ed458e3..8151a60d3 100644 --- a/wadsrc_widepix/CMakeLists.txt +++ b/wadsrc_widepix/CMakeLists.txt @@ -1,3 +1 @@ -cmake_minimum_required( VERSION 3.1.0 ) - add_pk3(game_widescreen_gfx.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)