Fix tiff-4.2.0 build scripts

This commit is contained in:
manongjohn 2022-08-26 09:11:14 -04:00
parent 7317b1a174
commit 3200010e1d
4 changed files with 7 additions and 6 deletions

View file

@ -1,5 +1,5 @@
#!/bin/bash
pushd thirdparty/tiff-4.0.3
pushd thirdparty/tiff-4.2.0
CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --disable-jbig && make
popd

View file

@ -1,5 +1,5 @@
#!/bin/bash
pushd thirdparty/tiff-4.0.3
pushd thirdparty/tiff-4.2.0
./configure --disable-lzma --without-x && make
popd
@ -31,7 +31,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.13
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/jpeg-turbo/lib/pkgconfig"
cmake ../sources $CANON_FLAG \
-DQT_PATH=$USEQTLIB \
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.2.0/libtiff/ \
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
make -j7 # runs 7 jobs in parallel

View file

@ -237,6 +237,7 @@ am__depfiles_remade = ./$(DEPDIR)/mkg3states.Po \
./$(DEPDIR)/tif_error.Plo ./$(DEPDIR)/tif_extension.Plo \
./$(DEPDIR)/tif_fax3.Plo ./$(DEPDIR)/tif_fax3sm.Plo \
./$(DEPDIR)/tif_flush.Plo ./$(DEPDIR)/tif_getimage.Plo \
./$(DEPDIR)/tif_getimage_64.Plo \
./$(DEPDIR)/tif_jbig.Plo ./$(DEPDIR)/tif_jpeg.Plo \
./$(DEPDIR)/tif_jpeg_12.Plo ./$(DEPDIR)/tif_luv.Plo \
./$(DEPDIR)/tif_lzma.Plo ./$(DEPDIR)/tif_lzw.Plo \

View file

@ -1,4 +1,4 @@
# looks for libtiff(4.0.3 modified)
# looks for libtiff(4.2.0 modified)
find_path(
TIFF_INCLUDE_DIR
NAMES
@ -6,7 +6,7 @@ find_path(
HINTS
${SDKROOT}
PATH_SUFFIXES
tiff-4.0.3/libtiff/
tiff-4.2.0/libtiff/
# if mono or another framework with a tif library
# is installed, ignore it.
if(BUILD_ENV_APPLE)
@ -23,7 +23,7 @@ find_library(
HINTS
${SDKROOT}
PATH_SUFFIXES
tiff-4.0.3/libtiff/.libs
tiff-4.2.0/libtiff/.libs
NO_DEFAULT_PATH
)