diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-19 16:25:58 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-12-19 17:45:50 +0100 |
| commit | d6ae5289b603dae07e5204695a7735d86a9c1c1e (patch) | |
| tree | 1c7be6f92d968e2d627cd5254f7d048d181da9e0 /src | |
| parent | cde119a2512341c07f775a8ee8f49c6920ec74f0 (diff) | |
| download | PROJ-d6ae5289b603dae07e5204695a7735d86a9c1c1e.tar.gz PROJ-d6ae5289b603dae07e5204695a7735d86a9c1c1e.zip | |
Build: add optional curl dependency
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f5cabe5e..afe4bcb7 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@ @TIFF_CFLAGS@ @TIFF_ENABLED_FLAGS@ + -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ -I$(top_srcdir)/include @SQLITE3_CFLAGS@ @TIFF_CFLAGS@ @TIFF_ENABLED_FLAGS@ @CURL_CFLAGS@ @CURL_ENABLED_FLAGS@ 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@ @TIFF_LIBS@ +libproj_la_LIBADD = @SQLITE3_LIBS@ @TIFF_LIBS@ @CURL_LIBS@ libproj_la_SOURCES = \ pj_list.h proj_internal.h \ diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index eacc7a23..12dcb366 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -446,6 +446,11 @@ if(NOT DISABLE_TIFF_IS_STRONGLY_DISCOURAGED) target_link_libraries(${PROJ_CORE_TARGET} ${TIFF_LIBRARY}) endif() +if(CURL_FOUND) + include_directories(${CURL_INCLUDE_DIR}) + target_link_libraries(${PROJ_CORE_TARGET} ${CURL_LIBRARY}) +endif() + if(MSVC) target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE PROJ_MSVC_DLL_EXPORT=1) |