diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-06 20:23:54 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-12-07 02:18:15 +0100 |
| commit | 1b702a82f5e009745f5ca8bbed92579e33f598d4 (patch) | |
| tree | e5c788ebd1ec618e9aa4de8b49a661c79ebe0c45 /src | |
| parent | 22792cd55ba41ffadb248c246cc871612a5139c1 (diff) | |
| download | PROJ-1b702a82f5e009745f5ca8bbed92579e33f598d4.tar.gz PROJ-1b702a82f5e009745f5ca8bbed92579e33f598d4.zip | |
Build and CI: add libtiff dependency
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
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} |