From 9580f1a5ef1506a331f84ce50f0776c494f0a6f9 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 28 Oct 2024 15:21:23 +0800 Subject: [PATCH] Set LIBDIR for remaining cmake-built libraries. --- library_builders.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library_builders.sh b/library_builders.sh index 10770970..65783504 100644 --- a/library_builders.sh +++ b/library_builders.sh @@ -234,7 +234,7 @@ function build_openjpeg { fi local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/${archive_prefix}${OPENJPEG_VERSION}.tar.gz) (cd $out_dir \ - && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ + && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ && make install) touch openjpeg-stamp } @@ -342,7 +342,7 @@ function build_blosc { local cmake=$(get_modern_cmake) fetch_unpack https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz (cd c-blosc-${BLOSC_VERSION} \ - && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ + && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ && make install) touch blosc-stamp }