aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2020-02-21 10:23:42 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2020-02-21 10:23:42 +0000
commit532abdf67ddeaa90e1c37de7fae8d603f0b5d5cb (patch)
tree58d7a7e56840d4c90338c58d53d698ec8409a383 /src
parent2be384c5ac96d704c618ac098e3adc97072a0b71 (diff)
downloadPROJ-532abdf67ddeaa90e1c37de7fae8d603f0b5d5cb.tar.gz
PROJ-532abdf67ddeaa90e1c37de7fae8d603f0b5d5cb.zip
Switch build configuration logic from DISABLE_TIFF to ENABLE_TIFF
Diffstat (limited to 'src')
-rw-r--r--src/lib_proj.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index 9200baba..e764aeee 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -406,12 +406,14 @@ endif()
target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${SQLITE3_INCLUDE_DIR})
target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY})
-if(NOT DISABLE_TIFF)
+if(TIFF_ENABLED)
+ target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE -DTIFF_ENABLED)
target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${TIFF_INCLUDE_DIR})
target_link_libraries(${PROJ_CORE_TARGET} ${TIFF_LIBRARY})
endif()
-if(CURL_FOUND)
+if(CURL_ENABLED)
+ target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE -DCURL_ENABLED)
target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${CURL_INCLUDE_DIR})
target_link_libraries(${PROJ_CORE_TARGET} ${CURL_LIBRARY})
endif()