Skip to content

Commit

Permalink
Use Ninja in Azure Windows Release
Browse files Browse the repository at this point in the history
This is a continuation of #1906 and enables using Ninja for the Azure pipelines with windows builds also.
  • Loading branch information
Shelnutt2 committed Mar 3, 2024
1 parent 7d77872 commit 0cd7ba8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion misc/azure-libtiledb-darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@ steps:
git clone $(LIBTILEDB_REPO) $(TILEDB_SRC)
git -C $(TILEDB_SRC) checkout $(LIBTILEDB_SHA)
choco install ninja
mkdir $(TILEDB_INSTALL)
cd $(TILEDB_BUILD)
:: use cmake directly because the powershell arg/quoting rules are bonkers
cmake -A X64 -DCMAKE_BUILD_TYPE=Release -DTILEDB_VCPKG=ON -DTILEDB_WERROR=ON -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_TOOLS=OFF -DTILEDB_SUPERBUILD=ON -DTILEDB_FORCE_ALL_DEPS=ON -DTILEDB_CPP_API=ON -DTILEDB_TESTS=OFF -DTILEDB_HDFS=OFF -DTILEDB_LOG_OUTPUT_ON_FAILURE=ON -DBUILD_SHARED_LIBS=ON -DTILEDB_VERBOSE=ON -DMSVC_MP_FLAG="/MP3" -DCMAKE_INSTALL_PREFIX=$(TILEDB_INSTALL) $(TILEDB_SRC) .
cmake -DCMAKE_BUILD_TYPE=Release -DTILEDB_VCPKG=ON -DTILEDB_WERROR=ON -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_TOOLS=OFF -DTILEDB_SUPERBUILD=ON -DTILEDB_FORCE_ALL_DEPS=ON -DTILEDB_CPP_API=ON -DTILEDB_TESTS=OFF -DTILEDB_HDFS=OFF -DTILEDB_LOG_OUTPUT_ON_FAILURE=ON -DBUILD_SHARED_LIBS=ON -DTILEDB_VERBOSE=ON -DMSVC_MP_FLAG="/MP3" -DCMAKE_INSTALL_PREFIX=$(TILEDB_INSTALL) $(TILEDB_SRC) .
cmake --build . --config Release -j3
cmake --build . --target install-tiledb --config Release
Expand Down
2 changes: 2 additions & 0 deletions misc/azure-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ stages:
windows_libtiledb:
imageName: "windows-latest"
CMAKE_OSX_ARCHITECTURES: ""
CMAKE_GENERATOR: "Ninja"
pool:
vmImage: $(imageName)

Expand Down Expand Up @@ -95,6 +96,7 @@ stages:
CIBW_SKIP: "cp36-* *-win32 pp*"
CIBW_BUILD_VERBOSITY: 3
CIBW_ARCHS_MACOS: ""
CMAKE_GENERATOR: "Ninja"
pool:
vmImage: $(imageName)

Expand Down

0 comments on commit 0cd7ba8

Please sign in to comment.