From 7918a9cca91d3feb2c1c58f76ee97cedf42690fb Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 29 Jun 2024 20:53:26 -0700 Subject: [PATCH] [build] Use Ninja on Unix --- Brewfile | 1 + docker/dev/v6.14/Dockerfile.ubuntu.jammy | 1 + docker/dev/v6.14/Dockerfile.ubuntu.noble | 1 + docker/dev/v6.14/Dockerfile.ubuntu.oracular | 1 + scripts/build.sh | 3 ++- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Brewfile b/Brewfile index b1351f87f8339..ae21487fae893 100644 --- a/Brewfile +++ b/Brewfile @@ -1,5 +1,6 @@ # Build dependencies brew 'cmake' +brew 'ninja' brew 'pkg-config' brew 'tracy' diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.jammy b/docker/dev/v6.14/Dockerfile.ubuntu.jammy index e88e5fa09cfbd..43e1aefdeea3b 100644 --- a/docker/dev/v6.14/Dockerfile.ubuntu.jammy +++ b/docker/dev/v6.14/Dockerfile.ubuntu.jammy @@ -22,6 +22,7 @@ RUN apt-get install -y --no-install-recommends \ git \ lcov \ lsb-release \ + ninja-build \ pkg-config \ software-properties-common \ valgrind diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.noble b/docker/dev/v6.14/Dockerfile.ubuntu.noble index 8882bfd8b3886..0d9072e10ba12 100644 --- a/docker/dev/v6.14/Dockerfile.ubuntu.noble +++ b/docker/dev/v6.14/Dockerfile.ubuntu.noble @@ -22,6 +22,7 @@ RUN apt-get install -y --no-install-recommends \ git \ lcov \ lsb-release \ + ninja-build \ pkg-config \ software-properties-common \ valgrind diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.oracular b/docker/dev/v6.14/Dockerfile.ubuntu.oracular index 4c47e6eabe778..67aafa23c2ea7 100644 --- a/docker/dev/v6.14/Dockerfile.ubuntu.oracular +++ b/docker/dev/v6.14/Dockerfile.ubuntu.oracular @@ -22,6 +22,7 @@ RUN apt-get install -y --no-install-recommends \ git \ lcov \ lsb-release \ + ninja-build \ pkg-config \ software-properties-common \ valgrind diff --git a/scripts/build.sh b/scripts/build.sh index 2d12b171b881e..69aefb22688d9 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -183,9 +183,10 @@ if [ -n "$DART_USE_SYSTEM_IMGUI" ]; then cmake_args+=" -DDART_USE_SYSTEM_IMGUI=$DART_USE_SYSTEM_IMGUI" fi -cmake .. \ +cmake \ -S $source_dir \ -B $build_dir \ + -G Ninja \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DDART_VERBOSE=ON \ -DDART_TREAT_WARNINGS_AS_ERRORS=ON \