Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deprecation warnings #266

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix deprecation warnings #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10354d7
Bump CMake minimum required version
scribam Jul 28, 2024
2707984
Update actions/checkout and actions/upload-artifact to v4
scribam Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/compilation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -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/
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/")
Expand Down
2 changes: 1 addition & 1 deletion cmake_toolchain/vita.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
2 changes: 1 addition & 1 deletion src/vita-libs-gen-2/vita-libs-gen-2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/vita-libs-gen/vita-libs-gen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down