diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 44df48e8d8..c9459586a1 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -69,6 +69,9 @@ jobs: share key: ${{ runner.os }}${{ inputs.build_variant }}-deps-${{ hashFiles('submodule-status') }} + - name: Install ninja-build tool + uses: seanmiddleditch/gha-setup-ninja@v3 + - name: Build dependencies if: steps.cache-deps.outputs.cache-hit != 'true' run: make xcode/deps diff --git a/action-install-linux.sh b/action-install-linux.sh index 8035b4ac5c..ac49d61ba4 100755 --- a/action-install-linux.sh +++ b/action-install-linux.sh @@ -15,6 +15,7 @@ sudo apt update -y # https://bugs.launchpad.net/ubuntu/+source/google-glog/+bug/1991919 # https://github.com/kadalu-tech/pkgs/pull/2/files#r1001042597 sudo apt install -y libunwind-dev +sudo apt install -y ninja-build sudo apt install -y ${dep_packages[@]} make deps/gtest make -C deps/opencc build diff --git a/deps.mk b/deps.mk index ac8f6e1bd8..1e15c6cb7c 100644 --- a/deps.mk +++ b/deps.mk @@ -23,7 +23,7 @@ clean-src: glog: cd $(src_dir)/glog; \ - cmake . -B$(build) \ + cmake . -B$(build) -GNinja \ -DBUILD_SHARED_LIBS:BOOL=OFF \ -DBUILD_TESTING:BOOL=OFF \ -DWITH_GFLAGS:BOOL=OFF \ @@ -33,7 +33,7 @@ glog: gtest: cd $(src_dir)/googletest; \ - cmake . -B$(build) \ + cmake . -B$(build) -GNinja \ -DBUILD_GMOCK:BOOL=OFF \ -DCMAKE_BUILD_TYPE:STRING="Release" \ -DCMAKE_INSTALL_PREFIX:PATH="$(rime_root)" \ @@ -41,7 +41,7 @@ gtest: leveldb: cd $(src_dir)/leveldb; \ - cmake . -B$(build) \ + cmake . -B$(build) -GNinja \ -DLEVELDB_BUILD_BENCHMARKS:BOOL=OFF \ -DLEVELDB_BUILD_TESTS:BOOL=OFF \ -DCMAKE_BUILD_TYPE:STRING="Release" \ @@ -50,14 +50,14 @@ leveldb: marisa: cd $(src_dir)/marisa-trie; \ - cmake $(src_dir) -B$(build) \ + cmake $(src_dir) -B$(build) -GNinja \ -DCMAKE_BUILD_TYPE:STRING="Release" \ -DCMAKE_INSTALL_PREFIX:PATH="$(rime_root)" \ && cmake --build $(build) --target install opencc: cd $(src_dir)/opencc; \ - cmake . -B$(build) \ + cmake . -B$(build) -GNinja \ -DBUILD_SHARED_LIBS:BOOL=OFF \ -DCMAKE_BUILD_TYPE:STRING="Release" \ -DCMAKE_INSTALL_PREFIX:PATH="$(rime_root)" \ @@ -65,7 +65,7 @@ opencc: yaml-cpp: cd $(src_dir)/yaml-cpp; \ - cmake . -B$(build) \ + cmake . -B$(build) -GNinja \ -DYAML_CPP_BUILD_CONTRIB:BOOL=OFF \ -DYAML_CPP_BUILD_TESTS:BOOL=OFF \ -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \