mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-02-03 04:21:15 +00:00
👷 chore: use cpack
This commit is contained in:
parent
966f5d2c54
commit
ef63a518d3
14
.github/workflows/ci.yml
vendored
14
.github/workflows/ci.yml
vendored
@ -110,7 +110,7 @@ jobs:
|
|||||||
run: cmake --build build --verbose
|
run: cmake --build build --verbose
|
||||||
|
|
||||||
- name: Package (CPack)
|
- name: Package (CPack)
|
||||||
if: ${{ !matrix.n3ds && !matrix.xbox-one }}
|
if: ${{ !matrix.n3ds }}
|
||||||
run: |
|
run: |
|
||||||
cd build
|
cd build
|
||||||
cpack .
|
cpack .
|
||||||
@ -145,15 +145,6 @@ jobs:
|
|||||||
mkdir dist
|
mkdir dist
|
||||||
mv *.3dsx dist/
|
mv *.3dsx dist/
|
||||||
|
|
||||||
- name: Package (Xbox One)
|
|
||||||
if: ${{ matrix.xbox-one }}
|
|
||||||
run: |
|
|
||||||
cd build
|
|
||||||
mkdir dist
|
|
||||||
mv AppPackages/isle/*/Dependencies/x64/Microsoft.VCLibs.x64.*.14.00.appx dist/
|
|
||||||
mv AppPackages/isle/*/*.msix dist/ || true
|
|
||||||
mv AppPackages/isle/*/*.msixbundle dist/ || true
|
|
||||||
|
|
||||||
- name: Upload Build Artifacts
|
- name: Upload Build Artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
@ -162,9 +153,6 @@ jobs:
|
|||||||
build/dist/isle-*
|
build/dist/isle-*
|
||||||
build/dist/*.AppImage
|
build/dist/*.AppImage
|
||||||
build/dist/*.3dsx
|
build/dist/*.3dsx
|
||||||
build/dist/*.msix
|
|
||||||
build/dist/*.msixbundle
|
|
||||||
build/dist/Microsoft.VCLibs.x64.*.14.00.appx
|
|
||||||
|
|
||||||
flatpak:
|
flatpak:
|
||||||
name: "Flatpak (${{ matrix.arch }})"
|
name: "Flatpak (${{ matrix.arch }})"
|
||||||
|
|||||||
@ -695,14 +695,20 @@ endif()
|
|||||||
|
|
||||||
string(REPLACE ";" "-" ISLE_CPUS_STRING "${ISLE_CPUS}")
|
string(REPLACE ";" "-" ISLE_CPUS_STRING "${ISLE_CPUS}")
|
||||||
string(TOLOWER "${ISLE_CPUS_STRING}" ISLE_CPUS_STRING)
|
string(TOLOWER "${ISLE_CPUS_STRING}" ISLE_CPUS_STRING)
|
||||||
|
if (WINDOWS_STORE)
|
||||||
|
set(ISLE_PACKAGE_NAME "Xbox_One_Series_XS-${ISLE_CPUS_STRING}" CACHE STRING "Platform name of the package")
|
||||||
|
else()
|
||||||
set(ISLE_PACKAGE_NAME "${CMAKE_SYSTEM_NAME}-${ISLE_CPUS_STRING}" CACHE STRING "Platform name of the package")
|
set(ISLE_PACKAGE_NAME "${CMAKE_SYSTEM_NAME}-${ISLE_CPUS_STRING}" CACHE STRING "Platform name of the package")
|
||||||
|
endif()
|
||||||
if(BUILD_SHARED_LIBS)
|
if(BUILD_SHARED_LIBS)
|
||||||
list(APPEND install_extra_targets lego1)
|
list(APPEND install_extra_targets lego1)
|
||||||
endif()
|
endif()
|
||||||
|
if (NOT (NINTENDO_3DS OR WINDOWS_STORE))
|
||||||
install(TARGETS isle ${install_extra_targets}
|
install(TARGETS isle ${install_extra_targets}
|
||||||
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
|
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
|
||||||
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
if (ISLE_BUILD_CONFIG)
|
if (ISLE_BUILD_CONFIG)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
find_program(WINDEPLOYQT_EXECUTABLE windeployqt)
|
find_program(WINDEPLOYQT_EXECUTABLE windeployqt)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user