From 54d1c874a209f9b463034110e543e97c9ba8dc23 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sun, 28 Jul 2024 18:58:20 +0200 Subject: [PATCH] use ninja on linux --- .gitea/workflows/build_pc.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build_pc.yml b/.gitea/workflows/build_pc.yml index 864c439..ba6d97d 100644 --- a/.gitea/workflows/build_pc.yml +++ b/.gitea/workflows/build_pc.yml @@ -19,15 +19,18 @@ jobs: config: - { name: "Windows", - os: windows_x64 + os: windows_x64, + generator: '' } - { name: "Linux", - os: ubuntu-latest + os: ubuntu-latest, + generator: '-G ninja' } # - { # name: "macOS", -# os: macos-latest +# os: macos-latest, +# generator: '-G "xcode"' # } steps: @@ -47,7 +50,7 @@ jobs: sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip && sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE="${{github.workspace}}/.gitea/workflows/DependencyMirrors.txt" + run: cmake ${{matrix.config.generator}} -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE="${{github.workspace}}/.gitea/workflows/DependencyMirrors.txt" - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Test