diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd984de..b4047e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -167,7 +167,7 @@ jobs: if: steps.cache-prefix-restore.outputs.cache-hit != 'true' run: | 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 + 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 --build ${{ steps.strings.outputs.build-output-dir }}-qtkeychain --config ${{ matrix.build_type }} --target install - name: Save Prefix diff --git a/scripts/windows-setup.ps1 b/scripts/windows-setup.ps1 index 2763c5f..03c21cd 100644 --- a/scripts/windows-setup.ps1 +++ b/scripts/windows-setup.ps1 @@ -117,6 +117,6 @@ CheckCompileResult "qcoro" # Build QtKeychain Clone "qtkeychain" "https://github.com/frankosterfeld/qtkeychain.git" -Configure "qtkeychain" "-DBUILD_TESTING=OFF" +Configure "qtkeychain" "-DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON" cmake --build "$BuildDir-qtkeychain" --config Debug --target install --parallel $NumCores CheckCompileResult "qtkeychain" \ No newline at end of file