Skip to content

Commit

Permalink
CI: Don't overwrite cmake_extra_args
Browse files Browse the repository at this point in the history
  • Loading branch information
syyyr authored and fvacek committed Nov 5, 2024
1 parent 093233c commit 24f8052
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/actions/cmake/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ runs:
if: inputs.qt_arch == 'android_arm64_v8a'
run: |
chmod +x "${Qt6_DIR}/bin/qt-cmake"
echo cmake_extra_args="'-DQT_HOST_PATH=$(realpath "${Qt6_DIR}/../gcc_64")'" >> "$GITHUB_ENV"
echo cmake_extra_args="${cmake_extra_args} '-DQT_HOST_PATH=$(realpath "${Qt6_DIR}/../gcc_64")'" >> "$GITHUB_ENV"
echo CMAKE_BIN="${Qt6_DIR}/bin/qt-cmake" >> "$GITHUB_ENV"
shell: bash

Expand All @@ -99,7 +99,7 @@ runs:
run: |
# Need to use Ninja with MSVC, otherwise ccache doesn't work. And I don't want to use MSBuild anyway. Hopefully
# that won't be an issue.
echo cmake_extra_args="'-G Ninja'" >> "$GITHUB_ENV"
echo cmake_extra_args="${cmake_extra_args} '-G Ninja'" >> "$GITHUB_ENV"
shell: bash

- name: Configure CMake
Expand Down

0 comments on commit 24f8052

Please sign in to comment.