From 4a295bc446090c804bc2195bdf4ad4248ad983ab Mon Sep 17 00:00:00 2001 From: Sameeul Samee Date: Tue, 7 Jan 2025 12:15:46 -0500 Subject: [PATCH] fix jpeg install lookup --- ci-utils/install_prereq_linux.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh index dba8b89d..8202988d 100755 --- a/ci-utils/install_prereq_linux.sh +++ b/ci-utils/install_prereq_linux.sh @@ -142,13 +142,15 @@ if [[ $BUILD_Z5_DEP -eq 1 ]]; then cd ../../ fi -JPEG_INSTALL_PATH=$PWD -curl -L http://www.ijg.org/files/jpegsrc.v9f.tar.gz -o jpegsrc.v9f.tar.gz -tar -xzf jpegsrc.v9f.tar.gz -cd jpeg-9f -./configure --prefix="$JPEG_INSTALL_PATH"/"$LOCAL_INSTALL_DIR" + +curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.zip -o 3.1.0.zip +unzip 3.1.0.zip +cd libjpeg-turbo-3.1.0 +mkdir build_man +cd build_man +cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ .. make install -j4 -cd .. +cd ../../ if [[ $BULD_DCMTK_DEP -eq 1 ]]; then curl -L https://github.com/glennrp/libpng/archive/refs/tags/v1.6.39.zip -o v1.6.39.zip @@ -192,7 +194,7 @@ unzip tiff-4.6.0.zip cd tiff-4.6.0 mkdir build_man cd build_man -cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include .. +cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ .. make install -j4 cd ../../