From 00a49854eda8914a30fcf5c304ec9d0c351d3ff4 Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:37:00 -0400 Subject: [PATCH] Fixed the prefix path in the build scripts --- buildscripts/build_hdf5.sh | 6 +++--- buildscripts/build_netcdf-c.sh | 6 +++--- buildscripts/build_netcdf-fortran.sh | 6 +++--- buildscripts/build_zlib.sh | 6 +++--- pyproject.toml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/buildscripts/build_hdf5.sh b/buildscripts/build_hdf5.sh index 98b3609a2..f6c5a2938 100755 --- a/buildscripts/build_hdf5.sh +++ b/buildscripts/build_hdf5.sh @@ -64,12 +64,12 @@ printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/hdfsrc ZLIB_ROOT=${PREFIX} -cmake -B build -S . -G Ninja +cmake -B build -S . -G Ninja -DCMAKE_INSTALL_PREFIX=${PREFIX} cmake --build build -j${NPROC} if [ -w ${PREFIX} ]; then - cmake --install build --prefix ${PREFIX} + cmake --install build else - sudo cmake --install build --prefix ${PREFIX} + sudo cmake --install build fi if [ $? -ne 0 ]; then diff --git a/buildscripts/build_netcdf-c.sh b/buildscripts/build_netcdf-c.sh index addb84ec7..91be2b04c 100755 --- a/buildscripts/build_netcdf-c.sh +++ b/buildscripts/build_netcdf-c.sh @@ -53,12 +53,12 @@ printf "HDF5_ROOT: ${HDF5_ROOT}\n" printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/netcdf-c-* -cmake -B build -S . -G Ninja +cmake -B build -S . -G Ninja -DCMAKE_INSTALL_PREFIX=${PREFIX} cmake --build build -j${NPROC} if [ -w ${PREFIX} ]; then - cmake --install build --prefix ${PREFIX} + cmake --install build else - sudo cmake --install build --prefix ${PREFIX} + sudo cmake --install build fi if [ $? -ne 0 ]; then diff --git a/buildscripts/build_netcdf-fortran.sh b/buildscripts/build_netcdf-fortran.sh index 42c5b6e7e..8214ed8fe 100755 --- a/buildscripts/build_netcdf-fortran.sh +++ b/buildscripts/build_netcdf-fortran.sh @@ -57,12 +57,12 @@ if [ $OS = "MacOSX" ]; then else netCDF_LIBRARIES="${PREFIX}/lib/libnetcdf.so" fi -cmake -B build -S . -G Ninja -DnetCDF_INCLUDE_DIR="${PREFIX}/include" -DnetCDF_LIBRARIES="${netCDF_LIBRARIES}" +cmake -B build -S . -G Ninja -DnetCDF_INCLUDE_DIR="${PREFIX}/include" -DnetCDF_LIBRARIES="${netCDF_LIBRARIES}" -DCMAKE_INSTALL_PREFIX=${PREFIX} cmake --build build -j${NPROC} if [ -w ${PREFIX} ]; then - cmake --install build --prefix ${PREFIX} + cmake --install build else - sudo cmake --install build --prefix ${PREFIX} + sudo cmake --install build fi if [ $? -ne 0 ]; then diff --git a/buildscripts/build_zlib.sh b/buildscripts/build_zlib.sh index 79b145eb3..93275a8e8 100755 --- a/buildscripts/build_zlib.sh +++ b/buildscripts/build_zlib.sh @@ -51,12 +51,12 @@ printf "LDFLAGS: ${LDFLAGS}\n" printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/zlib-* -cmake -B build -S . -G Ninja +cmake -B build -S . -G Ninja -DCMAKE_INSTALL_PREFIX=${PREFIX} cmake --build build -j${NPROC} if [ -w ${PREFIX} ]; then - cmake --install build --prefix ${PREFIX} + cmake --install build else - sudo cmake --install build --prefix ${PREFIX} + sudo cmake --install build fi if [ $? -ne 0 ]; then diff --git a/pyproject.toml b/pyproject.toml index b0571eaff..790bd6e11 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -98,7 +98,7 @@ netCDF-Fortran_DIR="${PREFIX}/lib/cmake/netCDF" [tool.cibuildwheel.macos] before-all = [ "brew install coreutils", - "LIBS=\"\" buildscripts/build_dependencies.sh -p ${PREFIX} -d ${HOME}/Downloads -m ${MACOSX_DEPLOYMENT_TARGET}" + "LIBS=\"\" buildscripts/build_dependencies.sh -p ${PREFIX} -d ${PREFIX}/build -m ${MACOSX_DEPLOYMENT_TARGET}" ] [tool.cibuildwheel.linux]