From ba618d308c859f423cf67c8cb368e4b65c15c7bd Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 8 Mar 2021 13:56:57 +0100 Subject: [PATCH] - bumped CMake version to 3.1.0 in all projects to reduce warning spam in recent versions. 3.1.0 is the highest minimum set in the existing subprojects so this will not exclude anything that hadn't been already. --- libraries/asmjit/CMakeLists.txt | 2 +- libraries/bzip2/CMakeLists.txt | 2 +- libraries/gdtoa/CMakeLists.txt | 2 +- libraries/glslang/OGLCompilersDLL/CMakeLists.txt | 2 +- libraries/glslang/glslang/CMakeLists.txt | 2 +- libraries/glslang/spirv/CMakeLists.txt | 2 +- libraries/jpeg/CMakeLists.txt | 2 +- libraries/lzma/CMakeLists.txt | 2 +- libraries/zlib/CMakeLists.txt | 2 +- src/CMakeLists.txt | 3 ++- 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_widescreen/CMakeLists.txt | 2 +- 19 files changed, 20 insertions(+), 19 deletions(-) diff --git a/libraries/asmjit/CMakeLists.txt b/libraries/asmjit/CMakeLists.txt index 6b7636ebe..283b54fbc 100644 --- a/libraries/asmjit/CMakeLists.txt +++ b/libraries/asmjit/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required( VERSION 3.1.0 ) #make_release_only() diff --git a/libraries/bzip2/CMakeLists.txt b/libraries/bzip2/CMakeLists.txt index e01d5c09e..6ca7a4e6d 100644 --- a/libraries/bzip2/CMakeLists.txt +++ b/libraries/bzip2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() diff --git a/libraries/gdtoa/CMakeLists.txt b/libraries/gdtoa/CMakeLists.txt index 485f3778b..834340909 100644 --- a/libraries/gdtoa/CMakeLists.txt +++ b/libraries/gdtoa/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" ) diff --git a/libraries/glslang/OGLCompilersDLL/CMakeLists.txt b/libraries/glslang/OGLCompilersDLL/CMakeLists.txt index c6e6c8fc2..392fa7900 100644 --- a/libraries/glslang/OGLCompilersDLL/CMakeLists.txt +++ b/libraries/glslang/OGLCompilersDLL/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() use_fast_math() diff --git a/libraries/glslang/glslang/CMakeLists.txt b/libraries/glslang/glslang/CMakeLists.txt index 3cd287b39..30b57c588 100644 --- a/libraries/glslang/glslang/CMakeLists.txt +++ b/libraries/glslang/glslang/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() use_fast_math() diff --git a/libraries/glslang/spirv/CMakeLists.txt b/libraries/glslang/spirv/CMakeLists.txt index d39a6e300..16df27d7b 100644 --- a/libraries/glslang/spirv/CMakeLists.txt +++ b/libraries/glslang/spirv/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() use_fast_math() diff --git a/libraries/jpeg/CMakeLists.txt b/libraries/jpeg/CMakeLists.txt index 33a3938cf..d57779495 100644 --- a/libraries/jpeg/CMakeLists.txt +++ b/libraries/jpeg/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() diff --git a/libraries/lzma/CMakeLists.txt b/libraries/lzma/CMakeLists.txt index b0d7565cd..570265049 100644 --- a/libraries/lzma/CMakeLists.txt +++ b/libraries/lzma/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() diff --git a/libraries/zlib/CMakeLists.txt b/libraries/zlib/CMakeLists.txt index a1d6637a9..14f0175f6 100644 --- a/libraries/zlib/CMakeLists.txt +++ b/libraries/zlib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required( VERSION 3.1.0 ) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) make_release_only() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d44bf4716..b67730a4c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) include(precompiled_headers) @@ -1190,6 +1190,7 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE ${PCH_SOURCES} common/utility/x86.cpp common/thirdparty/strnatcmp.c + common/thirdparty/gain_analysis.c common/utility/zstring.cpp common/utility/findfile.cpp common/thirdparty/math/asin.c diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index b3fed70ff..8725c56e8 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) add_subdirectory( re2c ) add_subdirectory( lemon ) diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt index e092cf6e9..dd1d41bf1 100644 --- a/tools/lemon/CMakeLists.txt +++ b/tools/lemon/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) 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 b362a3b84..9fcfef5a2 100644 --- a/tools/re2c/CMakeLists.txt +++ b/tools/re2c/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) if( NOT CMAKE_CROSSCOMPILING ) diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt index 6a36b2cb5..65eb2fb72 100644 --- a/tools/zipdir/CMakeLists.txt +++ b/tools/zipdir/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) if( NOT CMAKE_CROSSCOMPILING ) include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) diff --git a/wadsrc/CMakeLists.txt b/wadsrc/CMakeLists.txt index 80189a328..9e4393864 100644 --- a/wadsrc/CMakeLists.txt +++ b/wadsrc/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required( VERSION 2.8.7 ) +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 a76c5dc36..e0268d1a3 100644 --- a/wadsrc_bm/CMakeLists.txt +++ b/wadsrc_bm/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required( VERSION 2.4 ) +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 0eacb8a53..d9a1b272f 100644 --- a/wadsrc_extra/CMakeLists.txt +++ b/wadsrc_extra/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required( VERSION 2.8.7 ) +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 92f89314a..4f9d87d7c 100644 --- a/wadsrc_lights/CMakeLists.txt +++ b/wadsrc_lights/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required( VERSION 2.4 ) +cmake_minimum_required( VERSION 3.1.0 ) add_pk3(lights.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static) diff --git a/wadsrc_widescreen/CMakeLists.txt b/wadsrc_widescreen/CMakeLists.txt index 14126355a..83ed458e3 100644 --- a/wadsrc_widescreen/CMakeLists.txt +++ b/wadsrc_widescreen/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required( VERSION 2.4 ) +cmake_minimum_required( VERSION 3.1.0 ) add_pk3(game_widescreen_gfx.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)