From 58b7997a52a020aec542336914b14421042ce992 Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:41:49 -0400 Subject: [PATCH] Added Ninja to the linux build --- buildscripts/build_dependencies.sh | 19 +++++++++++++++++++ pyproject.toml | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/buildscripts/build_dependencies.sh b/buildscripts/build_dependencies.sh index ba978214c..704aa1e28 100755 --- a/buildscripts/build_dependencies.sh +++ b/buildscripts/build_dependencies.sh @@ -19,6 +19,25 @@ ARGS=$@ NPROC=$(nproc) cd $ROOT_DIR +NINJA_VER="1.11.1" + +printf "*********************************************************\n" +printf "* FETCHING NINJA SOURCE *\n" +printf "*********************************************************\n" +printf "Copying files to ${DEPENDENCY_DIR}\n" +mkdir -p ${DEPENDENCY_DIR} +if [ ! -d ${DEPENDENCY_DIR}/ninja-${NINJA_VER} ]; then + [ -d ${DEPENDENCY_DIR}/zlib-* ] && rm -rf ${DEPENDENCY_DIR}/zlib-* + curl -L https://github.com/ninja-build/ninja/archive/refs/tags/v${NINJA_VER}.tar.gz | tar xvz -C ${DEPENDENCY_DIR} +fi +cd ${DEPENDENCY_DIR}/ninja-* +cmake -B build -S . -DCMAKE_INSTALL_PREFIX=${PREFIX} +cmake --build build +if [ -w ${PREFIX} ]; then + cmake --install build +else + sudo cmake --install build +fi set -e ${SCRIPT_DIR}/build_zlib.sh ${ARGS} diff --git a/pyproject.toml b/pyproject.toml index 790bd6e11..e10f0aadf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -98,12 +98,14 @@ netCDF-Fortran_DIR="${PREFIX}/lib/cmake/netCDF" [tool.cibuildwheel.macos] before-all = [ "brew install coreutils", - "LIBS=\"\" buildscripts/build_dependencies.sh -p ${PREFIX} -d ${PREFIX}/build -m ${MACOSX_DEPLOYMENT_TARGET}" + "LIBS=\"\" buildscripts/build_dependencies.sh -p ${TMPDIR}/build -d ${HOME}/Downloads -m ${MACOSX_DEPLOYMENT_TARGET}" ] [tool.cibuildwheel.linux] before-all = [ "yum install doxygen libxml2-devel libcurl-devel -y", + "wget https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip", + "unzip ninja-linux.zip -d /usr/local/bin", "buildscripts/build_dependencies.sh -p /usr/local" ] [tool.cibuildwheel.linux.environment]