diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2020-02-23 21:06:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 21:06:14 +0100 |
| commit | 741c79137031c95b90a706ae36ae54d0ed73ac8f (patch) | |
| tree | 797b3cef65077904bd7891719f1849e9be9c71de /src | |
| parent | 1e6b0f2bf1442ac68b88baf4542e83dbc65bd93e (diff) | |
| parent | 532abdf67ddeaa90e1c37de7fae8d603f0b5d5cb (diff) | |
| download | PROJ-741c79137031c95b90a706ae36ae54d0ed73ac8f.tar.gz PROJ-741c79137031c95b90a706ae36ae54d0ed73ac8f.zip | |
Merge pull request #1963 from PROJ-BOT/backport-1951-to-7.0
[Backport 7.0] Switch build configuration logic from DISABLE_TIFF to ENABLE_TIFF
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib_proj.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index be8bc4db..d08a0ddf 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -404,12 +404,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() |