diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7202583cb..16b8e63b3 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -87,15 +87,13 @@ jobs: ${{ matrix.environment.prefix }}-libpng ${{ matrix.environment.prefix }}-libvncserver ${{ matrix.environment.prefix }}-rtmidi - ${{ matrix.environment.prefix }}-qt5-static - ${{ matrix.environment.prefix }}-qt5-translations - uses: actions/checkout@v2 - name: Configure CMake run: >- cmake -S . -B build --preset ${{ matrix.build.preset }} -D CMAKE_INSTALL_PREFIX=./build/artifacts - -D VNC=OFF + -D QT=OFF - name: Build run: cmake --build build --target ${{ matrix.build.target }} - uses: actions/upload-artifact@v2 @@ -195,6 +193,7 @@ jobs: -D CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{ github.workspace }}/${{ matrix.target.toolchain }} -D VCPKG_TARGET_TRIPLET=${{ matrix.target.triplet }} + -D QT=OFF shell: cmd - name: Build run: | @@ -260,7 +259,6 @@ jobs: -D CMAKE_INSTALL_PREFIX=./build/artifacts -D DEV_BRANCH=${{ matrix.build.dev-build }} -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} - -D QT=ON -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} -D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11 - name: Build @@ -324,9 +322,7 @@ jobs: --toolchain cmake/flags-gcc-x86_64.cmake -D DEV_BRANCH=${{ matrix.build.dev-build }} -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} - -D VNC=OFF -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} - -D QT=ON -D Qt5_DIR=/usr/local/Cellar/qt@5/5.15.2_1/lib/cmake/Qt5 -D Qt5LinguistTools_DIR=/usr/local/Cellar/qt@5/5.15.2_1/lib/cmake/Qt5LinguistTools/ - name: Build