Browse Source

Workaround for deprecation of old CMake versions

pull/7897/head
staphen 12 months ago committed by Anders Jenbo
parent
commit
3309a6f997
  1. 2
      .github/workflows/Windows_MinGW_x64.yml
  2. 2
      .github/workflows/Windows_MinGW_x86.yml
  3. 3
      3rdParty/Lua/CMakeLists.txt
  4. 3
      3rdParty/libpng/CMakeLists.txt
  5. 3
      3rdParty/tolk/CMakeLists.txt
  6. 5
      CMake/platforms/mingw/zt_defs.cmake

2
.github/workflows/Windows_MinGW_x64.yml

@ -36,7 +36,7 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{github.workspace}}
run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DCPACK=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/mingwcc64.toolchain.cmake -DDEVILUTIONX_SYSTEM_BZIP2=OFF -DDEVILUTIONX_STATIC_LIBSODIUM=ON -DDISCORD_INTEGRATION=ON -DSCREEN_READER_INTEGRATION=ON
run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DCPACK=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/mingwcc64.toolchain.cmake -DDEVILUTIONX_SYSTEM_BZIP2=OFF -DDEVILUTIONX_STATIC_LIBSODIUM=ON -DDISCORD_INTEGRATION=ON -DSCREEN_READER_INTEGRATION=ON -DMINGW_STDTHREADS_GENERATE_STDHEADERS=ON
- name: Build
working-directory: ${{github.workspace}}

2
.github/workflows/Windows_MinGW_x86.yml

@ -36,7 +36,7 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{github.workspace}}
run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DCPACK=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/mingwcc.toolchain.cmake -DDEVILUTIONX_SYSTEM_BZIP2=OFF -DDEVILUTIONX_STATIC_LIBSODIUM=ON -DDISCORD_INTEGRATION=ON -DSCREEN_READER_INTEGRATION=ON
run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DCPACK=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/mingwcc.toolchain.cmake -DDEVILUTIONX_SYSTEM_BZIP2=OFF -DDEVILUTIONX_STATIC_LIBSODIUM=ON -DDISCORD_INTEGRATION=ON -DSCREEN_READER_INTEGRATION=ON -DMINGW_STDTHREADS_GENERATE_STDHEADERS=ON
- name: Build
working-directory: ${{github.workspace}}

3
3rdParty/Lua/CMakeLists.txt vendored

@ -1,5 +1,8 @@
include(functions/FetchContent_ExcludeFromAll_backport)
# Workaround for deprecation of older CMake versions
set(CMAKE_POLICY_VERSION_MINIMUM 3.22)
set(LUA_ENABLE_TESTING OFF)
set(LUA_BUILD_COMPILER OFF)
if(DEVILUTIONX_STATIC_LUA)

3
3rdParty/libpng/CMakeLists.txt vendored

@ -1,5 +1,8 @@
include(functions/FetchContent_ExcludeFromAll_backport)
# Workaround for deprecation of older CMake versions
set(CMAKE_POLICY_VERSION_MINIMUM 3.22)
if(NOT DISABLE_LTO)
# Force CMake to raise an error if INTERPROCEDURAL_OPTIMIZATION
# is enabled and compiler does not support IPO

3
3rdParty/tolk/CMakeLists.txt vendored

@ -1,5 +1,8 @@
include(functions/FetchContent_ExcludeFromAll_backport)
# Workaround for deprecation of older CMake versions
set(CMAKE_POLICY_VERSION_MINIMUM 3.22)
include(FetchContent)
FetchContent_Declare_ExcludeFromAll(Tolk
URL https://github.com/sig-a11y/tolk/archive/89de98779e3b6365dc1688538d5de4ecba3fdbab.tar.gz

5
CMake/platforms/mingw/zt_defs.cmake

@ -1,4 +1,7 @@
option(MINGW_STDTHREADS_GENERATE_STDHEADERS "" ON)
option(MINGW_STDTHREADS_GENERATE_STDHEADERS "" OFF)
# Workaround for deprecation of older CMake versions
set(CMAKE_POLICY_VERSION_MINIMUM 3.22)
FetchContent_Declare_ExcludeFromAll(mingw-std-threads
GIT_REPOSITORY https://github.com/meganz/mingw-std-threads

Loading…
Cancel
Save