diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 4449a879c3c..21fc027ab72 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -48,7 +48,6 @@ jobs: if: ${{ matrix.vm_os == 'freebsd' }} env: BUILD_TYPE: ${{ matrix.build_type }} - CMAKE_POLICY_VERSION_MINIMUM: 3.5 # GLBINDING: ${{ matrix.glbinding }} # TODO: Re-add if available uses: vmactions/freebsd-vm@v0.1.4 with: @@ -80,4 +79,4 @@ jobs: # TODO: Uncomment whenever possible make -j3 VERBOSE=1 make install DESTDIR="/tmp/supertux" VERBOSE=1 - ./test_supertux2 \ No newline at end of file + ./test_supertux2 diff --git a/.github/workflows/gnulinux.yml b/.github/workflows/gnulinux.yml index 3520add459f..5be72a1feba 100644 --- a/.github/workflows/gnulinux.yml +++ b/.github/workflows/gnulinux.yml @@ -155,7 +155,6 @@ jobs: # FIXME: GoogleTest isn't detected by CMake on Ubuntu 18.04 # (also check the step that invokes the tests with ./test_supertux2) TESTS: ${{ matrix.os == 'ubuntu-22.04' }} - CMAKE_POLICY_VERSION_MINIMUM: 3.5 run: | cmake --version $CXX --version @@ -169,8 +168,6 @@ jobs: - name: Build and install working-directory: build - env: - CMAKE_POLICY_VERSION_MINIMUM: 3.5 run: | make -j3 VERBOSE=1 make install DESTDIR="/tmp/supertux" VERBOSE=1 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 87fa50a13e1..4eb70b1ea90 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -84,7 +84,6 @@ jobs: env: BUILD_TYPE: ${{ matrix.build_type }} GLBINDING: ${{ matrix.glbinding }} - CMAKE_POLICY_VERSION_MINIMUM: 3.5 run: | cmake --version $CXX --version @@ -101,8 +100,6 @@ jobs: -DINSTALL_SUBDIR_SHARE=share/supertux2 - name: Build and install - env: - CMAKE_POLICY_VERSION_MINIMUM: 3.5 working-directory: build run: | make -j3 VERBOSE=1 diff --git a/.github/workflows/scripting.yml b/.github/workflows/scripting.yml index d8cccac02dd..8ee3816dfab 100644 --- a/.github/workflows/scripting.yml +++ b/.github/workflows/scripting.yml @@ -57,7 +57,7 @@ jobs: cmake --version mkdir build cd build - cmake .. -DBUILD_DOCUMENTATION_WITH_SCRIPTING=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + cmake .. -DBUILD_DOCUMENTATION_WITH_SCRIPTING=ON make - name: Generate scripting reference diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index 71e533eecb7..5f51cce5aab 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -58,7 +58,7 @@ jobs: mkdir build cd build # TODO: Re-add -DWERROR=ON when warnings will be fixed - emcmake cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWARNINGS=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. + emcmake cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWARNINGS=ON .. - name: Sync data folder working-directory: build diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4225280e70e..d8c3afa2982 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -84,7 +84,6 @@ jobs: ARCH: ${{ matrix.arch }} BUILD_TYPE: ${{ matrix.build_type }} GLBINDING: ${{ matrix.glbinding }} - CMAKE_POLICY_VERSION_MINIMUM: 3.5 run: | cmake --version mkdir build @@ -95,7 +94,6 @@ jobs: working-directory: build env: BUILD_TYPE: ${{ matrix.build_type }} - CMAKE_POLICY_VERSION_MINIMUM: 3.5 run: | cmake --build . --config $Env:BUILD_TYPE diff --git a/CMakeLists.txt b/CMakeLists.txt index ac11a34ac72..269a7d1c088 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ # make # -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5) ## Project name to use as command prefix. diff --git a/tools/scripting_docs_gen/CMakeLists.txt b/tools/scripting_docs_gen/CMakeLists.txt index 246010eafb7..7025ca6e13c 100644 --- a/tools/scripting_docs_gen/CMakeLists.txt +++ b/tools/scripting_docs_gen/CMakeLists.txt @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5) project(ScriptingDocsGen) set(CMAKE_CXX_STANDARD 17)