Skip to content

Move from Ninja to Ninja Multi-Config #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angela28chen merged 2 commits into from
Dec 23, 2025
Merged

Move from Ninja to Ninja Multi-Config #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0396762
move from ninja to ninja multi-config
angela28chen Dec 22, 2025
d54ec9b
fix for macos dive UI executable path
angela28chen Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 48 additions & 27 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@ jobs:
python3 -m pip install mako
- name: Generate build files with cmake
run: |
cmake -DCMAKE_BUILD_TYPE=Debug -G "Visual Studio 17 2022" -A x64 -Bbuild .
cmake -G "Visual Studio 17 2022" -A x64 -Bbuild .
- name: Build Dive host tools with VS 2022
run: |
cmake --build build --config Debug
- name: Produce install artifacts
run: |
cmake --install build --prefix install --config Debug
- name: Run tests
run: |
ctest --output-on-failure -C Debug --test-dir build
Expand All @@ -55,10 +58,13 @@ jobs:
python3 -m pip install mako
- name: Generate build files with cmake
run: |
cmake -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 17 2022" -A x64 -Bbuild .
cmake -G "Visual Studio 17 2022" -A x64 -Bbuild .
- name: Build Dive host tools with VS 2022
run: |
cmake --build build --config Release
- name: Produce install artifacts
run: |
cmake --install build --prefix install --config Release
- name: Run tests
run: |
ctest --output-on-failure -C Release --test-dir build
Expand Down Expand Up @@ -96,17 +102,19 @@ jobs:
- name: Generate build files with cmake
run: |
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-14 \
-DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-14 \
-GNinja \
-G "Ninja Multi-Config" \
-Bbuild .
- name: Build Dive host tools with ninja with gcc-14
run: |
ninja -C build
ninja -C build -f build-Debug.ninja
- name: Ninja log
run: |
cat build/.ninja_log
- name: Produce install artifacts
run: |
cmake --install build --prefix install --config Debug
- name: Start Xvfb
run: |
Xvfb :99 -screen 0 1024x768x24 &
Expand Down Expand Up @@ -148,17 +156,19 @@ jobs:
- name: Generate build files with cmake
run: |
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-14 \
-DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-14 \
-GNinja \
-G "Ninja Multi-Config" \
-Bbuild .
- name: Build Dive host tools with ninja with gcc-14
run: |
ninja -C build
ninja -C build -f build-Release.ninja
- name: Ninja log
run: |
cat build/.ninja_log
- name: Produce install artifacts
run: |
cmake --install build --prefix install --config Release
- name: Start Xvfb
run: |
Xvfb :99 -screen 0 1024x768x24 &
Expand Down Expand Up @@ -200,17 +210,19 @@ jobs:
- name: Generate build files with cmake
run: |
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_C_COMPILER:FILEPATH=/usr/bin/clang-19 \
-DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/clang++-19 \
-GNinja \
-G "Ninja Multi-Config" \
-Bbuild .
- name: Build Dive host tools with ninja with clang-19
run: |
ninja -C build
ninja -C build -f build-Debug.ninja
- name: Ninja log
run: |
cat build/.ninja_log
- name: Produce install artifacts
run: |
cmake --install build --prefix install --config Debug
- name: Start Xvfb
run: |
Xvfb :99 -screen 0 1024x768x24 &
Expand Down Expand Up @@ -252,17 +264,19 @@ jobs:
- name: Generate build files with cmake
run: |
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER:FILEPATH=/usr/bin/clang-19 \
-DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/clang++-19 \
-GNinja \
-G "Ninja Multi-Config" \
-Bbuild .
- name: Build Dive host tools with ninja with clang-19
run: |
ninja -C build
ninja -C build -f build-Release.ninja
- name: Ninja log
run: |
cat build/.ninja_log
- name: Produce install artifacts
run: |
cmake --install build --prefix install --config Release
- name: Start Xvfb
run: |
Xvfb :99 -screen 0 1024x768x24 &
Expand Down Expand Up @@ -300,21 +314,24 @@ jobs:
run: ccache -z
- name: Generate build files with cmake
run: |
time cmake -DCMAKE_BUILD_TYPE=Debug \
time cmake \
-DCMAKE_C_COMPILER_LAUNCHER="cmake;-E;time;ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="cmake;-E;time;ccache" \
-DCMAKE_C_LINKER_LAUNCHER="cmake;-E;time" \
-DCMAKE_CXX_LINKER_LAUNCHER="cmake;-E;time" \
-GNinja \
-G "Ninja Multi-Config" \
-Bbuild .
- name: Build Dive host tools with ninja
run: |
time ninja -C build -d stats
time ninja -C build -d stats -f build-Debug.ninja
- name: Show ccache stats
run: ccache -s
- name: Ninja log
run: |
cat build/.ninja_log
- name: Produce install artifacts
run: |
cmake --install build --prefix install --config Debug
- name: Run tests
run: |
ctest --output-on-failure -C Debug --test-dir build
Expand Down Expand Up @@ -351,21 +368,24 @@ jobs:
run: ccache -z
- name: Generate build files with cmake
run: |
time cmake -DCMAKE_BUILD_TYPE=Release \
time cmake \
-DCMAKE_C_COMPILER_LAUNCHER="cmake;-E;time;ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="cmake;-E;time;ccache" \
-DCMAKE_C_LINKER_LAUNCHER="cmake;-E;time" \
-DCMAKE_CXX_LINKER_LAUNCHER="cmake;-E;time" \
-GNinja \
-G "Ninja Multi-Config" \
-Bbuild .
- name: Build Dive host tools with ninja
run: |
time ninja -C build -d stats
time ninja -C build -d stats -f build-Release.ninja
- name: Show ccache stats
run: ccache -s
- name: Ninja log
run: |
cat build/.ninja_log
- name: Produce install artifacts
run: |
cmake --install build --prefix install --config Release
- name: Run tests
run: |
ctest --output-on-failure -C Release --test-dir build
Expand Down Expand Up @@ -401,30 +421,31 @@ jobs:
ndk-version: r25
add-to-path: true

- name: Gemerate build files with cmake
- name: Generate build files with cmake
run: |
# DIVE_GFXR_GRADLE_CONSOLE=plain produces more readable output in CI
cmake -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
-G "Ninja" \
-DCMAKE_MAKE_PROGRAM="ninja" \
-DCMAKE_BUILD_TYPE=Debug \
-G "Ninja Multi-Config" \
-DCMAKE_SYSTEM_NAME=Android \
-DANDROID_ABI=arm64-v8a \
-DANDROID_PLATFORM=android-26 \
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=NEVER \
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=NEVER \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DDIVE_GFXR_GRADLE_CONSOLE=plain \
-Bbuild .
-Bbuild_android .
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
JAVA_HOME: ${{ steps.setup-java.outputs.java-home }}
- name: Build lib with NDK
run: |
ninja -C build
ninja -C build_android -f build-Debug.ninja
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
JAVA_HOME: ${{ steps.setup-java.outputs.java-home }}
- name: Ninja log
run: |
cat build/.ninja_log
cat build_android/.ninja_log
- name: Produce install artifacts
run: |
cmake --install build_android --prefix install --config Debug
Loading
Loading