Skip to content

Commit 885718f

Browse files
authored
chore: fix jpeg install instruction for Mac OS (PolusAI#254)
1 parent 923706a commit 885718f

File tree

2 files changed

+37
-19
lines changed

2 files changed

+37
-19
lines changed

ci-utils/install_prereq_linux.sh

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,16 @@ if [[ $BUILD_Z5_DEP -eq 1 ]]; then
143143
fi
144144

145145

146-
if [[ $BULD_DCMTK_DEP -eq 1 ]]; then
147-
JPEG_INSTALL_PATH=$PWD
148-
curl -L http://www.ijg.org/files/jpegsrc.v9e.tar.gz -o jpegsrc.v9e.tar.gz
149-
tar -xzf jpegsrc.v9e.tar.gz
150-
cd jpeg-9e
151-
./configure --prefix=
152-
make DESTDIR="$JPEG_INSTALL_PATH"/"$LOCAL_INSTALL_DIR" install
153-
./libtool --finish "$JPEG_INSTALL_PATH"/"$LOCAL_INSTALL_DIR"/lib
154-
cd ..
146+
curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.zip -o 3.1.0.zip
147+
unzip 3.1.0.zip
148+
cd libjpeg-turbo-3.1.0
149+
mkdir build_man
150+
cd build_man
151+
cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ ..
152+
make install -j4
153+
cd ../../
155154

155+
if [[ $BULD_DCMTK_DEP -eq 1 ]]; then
156156
curl -L https://github.com/glennrp/libpng/archive/refs/tags/v1.6.39.zip -o v1.6.39.zip
157157
unzip v1.6.39.zip
158158
cd libpng-1.6.39
@@ -184,17 +184,21 @@ cd ../../
184184

185185
for i in {1..5}
186186
do
187-
curl -L https://download.osgeo.org/libtiff/tiff-4.6.0.zip -o tiff-4.6.0.zip
188-
if [ -f "tiff-4.6.0.zip" ] ; then
187+
curl -L https://download.osgeo.org/libtiff/tiff-4.7.0.zip -o tiff-4.7.0.zip
188+
if [ -f "tiff-4.7.0.zip" ] ; then
189189
break
190190
fi
191191
done
192192

193-
unzip tiff-4.6.0.zip
194-
cd tiff-4.6.0
193+
unzip tiff-4.7.0.zip
194+
cd tiff-4.7.0
195195
mkdir build_man
196196
cd build_man
197-
cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ ..
197+
if [[ "$OSTYPE" == "darwin"* ]]; then
198+
cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib/libjpeg.dylib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
199+
else
200+
cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ ..
201+
fi
198202
make install -j4
199203
cd ../../
200204

@@ -212,7 +216,11 @@ if [[ $BULD_DCMTK_DEP -eq 1 ]]; then
212216
cd ..
213217
mkdir build_man
214218
cd build_man
215-
cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ -DDCMTK_WITH_ICONV=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_APPS=OFF ..
219+
if [[ "$OSTYPE" == "darwin"* ]]; then
220+
cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ -DDCMTK_WITH_ICONV=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_APPS=OFF -DJPEG_LIBRARY_RELEASE=../../"$LOCAL_INSTALL_DIR"/lib/libjpeg.dylib -DJPEG_INCLUDE_DIRS=../../"$LOCAL_INSTALL_DIR"/include ..
221+
else
222+
cmake -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ -DDCMTK_WITH_ICONV=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_APPS=OFF ..
223+
fi
216224
make install -j4
217225
cd ../../
218226

ci-utils/install_prereq_win.bat

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,25 @@ cmake --build . --config Release --target install --parallel 4
168168
popd
169169
popd
170170

171+
curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.zip -o 3.1.0.zip
172+
tar -xf 3.1.0.zip
173+
pushd libjpeg-turbo-3.1.0
174+
mkdir build_man
175+
pushd build_man
176+
cmake -DCMAKE_INSTALL_PREFIX=../../local_install/ -DCMAKE_PREFIX_PATH=../../local_install/ ..
177+
cmake --build . --config Release --target install --parallel 4
178+
popd
179+
popd
180+
171181
for /l %%x in (1, 1, 5) do (
172-
curl -L https://download.osgeo.org/libtiff/tiff-4.6.0.zip -o tiff-4.6.0.zip
173-
if exist tiff-4.6.0.zip (
182+
curl -L https://download.osgeo.org/libtiff/tiff-4.7.0.zip -o tiff-4.7.0.zip
183+
if exist tiff-4.7.0.zip (
174184
goto :continue_tiff
175185
)
176186
)
177187
:continue_tiff
178-
tar -xf tiff-4.6.0.zip
179-
pushd tiff-4.6.0
188+
tar -xf tiff-4.7.0.zip
189+
pushd tiff-4.7.0
180190
mkdir build_man
181191
pushd build_man
182192
cmake -DCMAKE_INSTALL_PREFIX=../../local_install/ -DCMAKE_PREFIX_PATH=../../local_install/ ..

0 commit comments

Comments
 (0)