From 10354d76efa8c559403ef738471728488247d24e Mon Sep 17 00:00:00 2001 From: scribam Date: Sun, 28 Jul 2024 14:03:55 +0200 Subject: [PATCH 1/2] Bump CMake minimum required version Fix deprecation warning "Compatibility with CMake < 3.5 will be removed from a future version of CMake." --- CMakeLists.txt | 2 +- cmake_toolchain/vita.cmake | 2 +- src/vita-libs-gen-2/vita-libs-gen-2.cpp | 2 +- src/vita-libs-gen/vita-libs-gen.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77ae432..99e0654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 3.5) project(vita-toolchain LANGUAGES C) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/") diff --git a/cmake_toolchain/vita.cmake b/cmake_toolchain/vita.cmake index 497f808..b67daff 100644 --- a/cmake_toolchain/vita.cmake +++ b/cmake_toolchain/vita.cmake @@ -11,7 +11,7 @@ ## - VITA_MKSFOEX_FLAGS ## - VITA_PACK_VPK_FLAGS -cmake_minimum_required( VERSION 3.2 ) +cmake_minimum_required( VERSION 3.5 ) ## add_include_guard() has been added in 3.10, but it's too recent so we don't use it if(__VITA_CMAKE_INCLUDED__) diff --git a/src/vita-libs-gen-2/vita-libs-gen-2.cpp b/src/vita-libs-gen-2/vita-libs-gen-2.cpp index f19e115..ff27d71 100644 --- a/src/vita-libs-gen-2/vita-libs-gen-2.cpp +++ b/src/vita-libs-gen-2/vita-libs-gen-2.cpp @@ -465,7 +465,7 @@ int gen_cmake(const char *dstdir, StubContext *stub_ctx){ stub_ctx->fp = fp; fprintf(fp, - "cmake_minimum_required(VERSION 2.8)\n" + "cmake_minimum_required(VERSION 3.5)\n" "if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)\n" "\tif(DEFINED ENV{VITASDK})\n" "\t\tset(CMAKE_TOOLCHAIN_FILE \"$ENV{VITASDK}/share/vita.toolchain.cmake\" CACHE PATH \"toolchain file\")\n" diff --git a/src/vita-libs-gen/vita-libs-gen.c b/src/vita-libs-gen/vita-libs-gen.c index 36585b4..adfda10 100644 --- a/src/vita-libs-gen/vita-libs-gen.c +++ b/src/vita-libs-gen/vita-libs-gen.c @@ -260,7 +260,7 @@ int generate_cmake(vita_imports_t **imports, int imports_count) } fputs( - "cmake_minimum_required(VERSION 2.8)\n\n" + "cmake_minimum_required(VERSION 3.5)\n\n" "if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)\n" "\tif(DEFINED ENV{VITASDK})\n" "\t\tset(CMAKE_TOOLCHAIN_FILE \"$ENV{VITASDK}/share/vita.toolchain.cmake\" CACHE PATH \"toolchain file\")\n" From 2707984d117000a28d15c21c7352c64a90b67bb7 Mon Sep 17 00:00:00 2001 From: scribam Date: Sun, 28 Jul 2024 14:04:33 +0200 Subject: [PATCH 2/2] Update actions/checkout and actions/upload-artifact to v4 --- .github/workflows/compilation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 3bd139a..bdac3a6 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true @@ -26,7 +26,7 @@ jobs: make install DESTDIR=../vita-toolchain - name: Upload artifacts if: ${{ success() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: vita-toolchain-${{ steps.core.outputs.sha8 }} path: ./vita-toolchain/usr/local/