aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt9
-rw-r--r--appveyor.yml4
-rw-r--r--configure.ac16
-rw-r--r--src/Makefile.am4
-rw-r--r--src/lib_proj.cmake4
-rwxr-xr-xtravis/csa/before_install.sh2
-rwxr-xr-xtravis/linux_clang/before_install.sh2
-rwxr-xr-xtravis/linux_gcc/before_install.sh1
-rwxr-xr-xtravis/linux_gcc7/before_install.sh3
-rwxr-xr-xtravis/mingw32/install.sh19
-rwxr-xr-xtravis/osx/before_install.sh3
11 files changed, 58 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5715389..bb8ae88f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,15 @@ IF("${SQLITE3_VERSION}" VERSION_LESS "3.11")
ENDIF()
################################################################################
+# Check for libtiff
+################################################################################
+
+find_package(TIFF REQUIRED)
+if(NOT TIFF_FOUND)
+ message(SEND_ERROR "libtiff dependency not found!")
+endif()
+
+################################################################################
# threading configuration
################################################################################
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
diff --git a/appveyor.yml b/appveyor.yml
index a631c3e8..fb934f3a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,9 +27,9 @@ build_script:
- set PATH=%CD%;%PATH%
- cd ..
- vcpkg install sqlite3:"%platform%"-windows
+ - vcpkg install tiff:"%platform%"-windows
- set SQLITE3_BIN=%APPVEYOR_BUILD_FOLDER%\sqlite3\bin
- mkdir %SQLITE3_BIN%
- - copy c:\projects\proj\vcpkg\installed\"%platform%"-windows\bin\sqlite3.dll %SQLITE3_BIN%
- ps: |
appveyor DownloadFile https://sqlite.org/2018/sqlite-tools-win32-x86-3250100.zip
7z x sqlite-tools-win32-x86-3250100.zip
@@ -47,6 +47,8 @@ build_script:
- set PROJ_DIR=%APPVEYOR_BUILD_FOLDER%\proj_dir
- cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED="%BUILD_LIBPROJ_SHARED%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=C:/projects/proj/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%"
- cmake --build . --config Release --target install
+ - copy c:\projects\proj\vcpkg\installed\"%platform%"-windows\bin\*.dll %PROJ_DIR%\bin
+ - dir %PROJ_DIR%\bin
test_script:
- echo test_script
diff --git a/configure.ac b/configure.ac
index 0ea8e04a..7c04f60b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,8 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
+
dnl Enable as much warnings as possible
AX_CFLAGS_WARN_ALL(C_WFLAGS)
AX_CXXFLAGS_WARN_ALL(CXX_WFLAGS)
@@ -295,6 +297,20 @@ if test x"$SQLITE3_CHECK" != x"yes" ; then
fi
dnl ---------------------------------------------------------------------------
+dnl Check for libtiff
+dnl ---------------------------------------------------------------------------
+
+if test "x$TIFF_CFLAGS$TIFF_LIBS" = "x" ; then
+ if $PKG_CONFIG libtiff; then
+ PKG_CHECK_MODULES([TIFF], [libtiff])
+ else
+ PKG_CHECK_MODULES([TIFF], [libtiff-4])
+ fi
+fi
+AC_SUBST(TIFF_CFLAGS,$TIFF_CFLAGS)
+AC_SUBST(TIFF_LIBS,$TIFF_LIBS)
+
+dnl ---------------------------------------------------------------------------
dnl Check for external Google Test
dnl ---------------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index a12de4e1..f58e57fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ TESTS = geodtest
check_PROGRAMS = geodtest
AM_CPPFLAGS = -DPROJ_LIB=\"$(pkgdatadir)\" \
- -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ -I$(top_srcdir)/include @SQLITE3_CFLAGS@
+ -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ -I$(top_srcdir)/include @SQLITE3_CFLAGS@ @TIFF_CFLAGS@
AM_CXXFLAGS = @CXX_WFLAGS@ @FLTO_FLAG@
include_HEADERS = proj.h proj_experimental.h proj_constants.h proj_api.h geodesic.h \
@@ -43,7 +43,7 @@ geodtest_LDADD = libproj.la
lib_LTLIBRARIES = libproj.la
libproj_la_LDFLAGS = -no-undefined -version-info 17:0:2
-libproj_la_LIBADD = @SQLITE3_LIBS@
+libproj_la_LIBADD = @SQLITE3_LIBS@ @TIFF_LIBS@
libproj_la_SOURCES = \
pj_list.h proj_internal.h \
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index f6112aef..f1547afe 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -435,8 +435,8 @@ if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
target_link_libraries(${PROJ_CORE_TARGET} ${CMAKE_THREAD_LIBS_INIT})
endif()
-include_directories(${SQLITE3_INCLUDE_DIR})
-target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY})
+include_directories(${SQLITE3_INCLUDE_DIR} ${TIFF_INCLUDE_DIR})
+target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY} ${TIFF_LIBRARY})
if(MSVC)
target_compile_definitions(${PROJ_CORE_TARGET}
diff --git a/travis/csa/before_install.sh b/travis/csa/before_install.sh
index c2e29064..8d0f3fd2 100755
--- a/travis/csa/before_install.sh
+++ b/travis/csa/before_install.sh
@@ -5,7 +5,7 @@ set -e
./travis/before_install_apt.sh
./travis/before_install_pip.sh
-sudo apt-get install -qq sqlite3 libsqlite3-dev
+sudo apt-get install -qq sqlite3 libsqlite3-dev libtiff-dev
CLANG_LLVM=clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-16.04
wget http://releases.llvm.org/6.0.0/$CLANG_LLVM.tar.xz
diff --git a/travis/linux_clang/before_install.sh b/travis/linux_clang/before_install.sh
index 8ce465a2..cfe7ba67 100755
--- a/travis/linux_clang/before_install.sh
+++ b/travis/linux_clang/before_install.sh
@@ -5,4 +5,4 @@ set -e
./travis/before_install_apt.sh
./travis/before_install_pip.sh
-sudo apt-get install -qq sqlite3 libsqlite3-dev
+sudo apt-get install -qq sqlite3 libsqlite3-dev libtiff-dev
diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh
index 7725b3ef..d4deb85e 100755
--- a/travis/linux_gcc/before_install.sh
+++ b/travis/linux_gcc/before_install.sh
@@ -9,6 +9,7 @@ sudo apt-get install -qq \
lcov \
doxygen graphviz \
sqlite3 libsqlite3-dev \
+ libtiff-dev \
cppcheck
scripts/cppcheck.sh
diff --git a/travis/linux_gcc7/before_install.sh b/travis/linux_gcc7/before_install.sh
index a3f6c8c0..b3e053c0 100755
--- a/travis/linux_gcc7/before_install.sh
+++ b/travis/linux_gcc7/before_install.sh
@@ -8,7 +8,8 @@ set -e
sudo apt-get install -qq \
lcov \
doxygen graphviz \
- sqlite3 libsqlite3-dev
+ sqlite3 libsqlite3-dev \
+ libtiff-dev
#scripts/cppcheck.sh
#scripts/doxygen.sh
diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh
index 52e4f7a6..bc9f3258 100755
--- a/travis/mingw32/install.sh
+++ b/travis/mingw32/install.sh
@@ -2,6 +2,9 @@
set -e
+unset CC
+unset CXX
+
export CCACHE_CPP2=yes
export PROJ_DB_CACHE_DIR="$HOME/.ccache"
@@ -16,6 +19,22 @@ ln -s $MINGW_PREFIX/libgcc_s_seh-1.dll $WINE_SYSDIR
ln -s $MINGW_PREFIX/libgcc_s_sjlj-1.dll $WINE_SYSDIR
ln -s /usr/$MINGW_ARCH/lib/libwinpthread-1.dll $WINE_SYSDIR
+# build zlib
+wget https://github.com/madler/zlib/archive/v1.2.11.tar.gz
+tar xzf v1.2.11.tar.gz
+(cd zlib-1.2.11 && sudo make install -fwin32/Makefile.gcc SHARED_MODE=1 PREFIX=x86_64-w64-mingw32- DESTDIR=/usr/$MINGW_ARCH/)
+sudo mkdir -p /usr/$MINGW_ARCH/include
+sudo mkdir -p /usr/$MINGW_ARCH/lib
+sudo cp /usr/$MINGW_ARCH/*.h /usr/$MINGW_ARCH/include
+sudo cp /usr/$MINGW_ARCH/libz.* /usr/$MINGW_ARCH/lib
+ln -s /usr/$MINGW_ARCH/zlib1.dll $WINE_SYSDIR
+
+# build libtiff
+wget https://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz
+tar xzf tiff-4.1.0.tar.gz
+(cd tiff-4.1.0 && ./configure --host=$MINGW_ARCH --prefix=/usr/$MINGW_ARCH && make -j2 && sudo make install)
+ln -s /usr/$MINGW_ARCH/bin/libtiff-5.dll $WINE_SYSDIR
+
# build sqlite3
wget https://sqlite.org/2018/sqlite-autoconf-3250100.tar.gz
tar xzf sqlite-autoconf-3250100.tar.gz
diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh
index 09a7a74f..5de816c8 100755
--- a/travis/osx/before_install.sh
+++ b/travis/osx/before_install.sh
@@ -6,7 +6,8 @@ export PATH=$HOME/Library/Python/3.7/bin:$PATH
brew update
brew install ccache
-brew install sqlite3
+#brew upgrade sqlite3
+#brew upgrade libtiff
brew install doxygen
brew install md5sha1sum
brew reinstall python
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-30 17:54:52 +0000