redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-05-18 07:07:45 +00:00
Code Activity

Fix QtKeychain target name tripping up windeployqt

Browse source 
The target name starts with Qt, so we need to change that.
This commit is contained in:
Joshua Goins 2024-04-25 21:03:14 -04:00
parent 064ca5b722
commit 82c25547d6
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View file

@ -43,7 +43,7 @@ jobs:
with: with:
version: "6.6.*" version: "6.6.*"
cache: true cache: true
modules: 'qtwebengine qtwebview qtshadertools' modules: 'qtwebengine qtwebview qtwebsockets qtshadertools'
- name: Set reusable strings - name: Set reusable strings
id: strings id: strings
@ -173,7 +173,7 @@ jobs:
if: steps.cache-prefix-restore.outputs.cache-hit != 'true' if: steps.cache-prefix-restore.outputs.cache-hit != 'true'
run: | run: |
git clone https://github.com/frankosterfeld/qtkeychain.git git clone https://github.com/frankosterfeld/qtkeychain.git
cmake -B ${{ steps.strings.outputs.build-output-dir }}-qtkeychain -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S qtkeychain -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON cmake -B ${{ steps.strings.outputs.build-output-dir }}-qtkeychain -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S qtkeychain -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON -DQTKEYCHAIN_TARGET_NAME=keychain
cmake --build ${{ steps.strings.outputs.build-output-dir }}-qtkeychain --config ${{ matrix.build_type }} --target install cmake --build ${{ steps.strings.outputs.build-output-dir }}-qtkeychain --config ${{ matrix.build_type }} --target install
- name: Build unshield - name: Build unshield

7
launcher/CMakeLists.txt
View file

@ -161,3 +161,10 @@ if (ENABLE_GAMEMODE)
endif () endif ()
install(TARGETS astra ${KF6_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS astra ${KF6_INSTALL_TARGETS_DEFAULT_ARGS})
qt_generate_deploy_app_script(
TARGET astra
OUTPUT_SCRIPT deploy_script
NO_UNSUPPORTED_PLATFORM_ERROR
)
install(SCRIPT ${deploy_script})

2
scripts/windows-setup.ps1
View file

@ -123,7 +123,7 @@ CheckCompileResult "qcoro"
# Build QtKeychain # Build QtKeychain
Clone "qtkeychain" "https://github.com/frankosterfeld/qtkeychain.git" Clone "qtkeychain" "https://github.com/frankosterfeld/qtkeychain.git"
Configure "qtkeychain" "-DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON" Configure "qtkeychain" "-DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON -DQTKEYCHAIN_TARGET_NAME=keychain"
cmake --build "$BuildDir-qtkeychain" --config Debug --target install --parallel $NumCores cmake --build "$BuildDir-qtkeychain" --config Debug --target install --parallel $NumCores
CheckCompileResult "qtkeychain" CheckCompileResult "qtkeychain"