Try building with ninja generator

This commit is contained in:
Jean Pierre Cimalando 2021-04-25 05:58:04 +02:00
parent cd1e4567f2
commit 8a5e4f4fe0
2 changed files with 9 additions and 7 deletions

View file

@ -42,9 +42,9 @@ for:
- ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/before_build.sh - ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/before_build.sh
build_script: build_script:
- cd build - cd build
- make -j2 sfizz_tests - cmake --build . -j2 --target sfizz_tests
- tests/sfizz_tests - tests/sfizz_tests
- make -j2 - cmake --build . -j2
after_build: after_build:
- chmod +x ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/after_build.sh - chmod +x ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/after_build.sh
- ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/after_build.sh - ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/after_build.sh

View file

@ -44,6 +44,7 @@ jobs:
run: | run: |
sudo apt-get update && \ sudo apt-get update && \
sudo apt-get install \ sudo apt-get install \
ninja-build \
libjack-jackd2-dev \ libjack-jackd2-dev \
libsndfile1-dev \ libsndfile1-dev \
libcairo2-dev \ libcairo2-dev \
@ -64,7 +65,8 @@ jobs:
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: | run: |
cmake "$GITHUB_WORKSPACE" -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \ cmake "$GITHUB_WORKSPACE" -G Ninja \
-DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-DSFIZZ_JACK=ON \ -DSFIZZ_JACK=ON \
-DSFIZZ_VST=ON \ -DSFIZZ_VST=ON \
-DSFIZZ_LV2_UI=ON \ -DSFIZZ_LV2_UI=ON \
@ -239,7 +241,7 @@ jobs:
shell: bash shell: bash
run: | run: |
pacman -Sqyu --noconfirm pacman -Sqyu --noconfirm
pacman -Sq --needed --noconfirm base-devel git wget mingw-w64-cmake mingw-w64-gcc mingw-w64-pkg-config mingw-w64-libsndfile pacman -Sq --needed --noconfirm base-devel git wget ninja mingw-w64-cmake mingw-w64-gcc mingw-w64-pkg-config mingw-w64-libsndfile
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: recursive submodules: recursive
@ -263,7 +265,7 @@ jobs:
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: | run: |
i686-w64-mingw32-cmake "$GITHUB_WORKSPACE" \ i686-w64-mingw32-cmake "$GITHUB_WORKSPACE" -G Ninja \
-DCMAKE_BUILD_TYPE="$BUILD_TYPE" \ -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-DENABLE_LTO=OFF \ -DENABLE_LTO=OFF \
-DSFIZZ_JACK=OFF \ -DSFIZZ_JACK=OFF \
@ -308,7 +310,7 @@ jobs:
shell: bash shell: bash
run: | run: |
pacman -Sqyu --noconfirm pacman -Sqyu --noconfirm
pacman -Sq --needed --noconfirm base-devel git wget mingw-w64-cmake mingw-w64-gcc mingw-w64-pkg-config mingw-w64-libsndfile pacman -Sq --needed --noconfirm base-devel git wget ninja mingw-w64-cmake mingw-w64-gcc mingw-w64-pkg-config mingw-w64-libsndfile
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: recursive submodules: recursive
@ -332,7 +334,7 @@ jobs:
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: | run: |
x86_64-w64-mingw32-cmake "$GITHUB_WORKSPACE" \ x86_64-w64-mingw32-cmake "$GITHUB_WORKSPACE" -G Ninja \
-DCMAKE_BUILD_TYPE="$BUILD_TYPE" \ -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-DENABLE_LTO=OFF \ -DENABLE_LTO=OFF \
-DSFIZZ_JACK=OFF \ -DSFIZZ_JACK=OFF \