9ba90e322e
* Projsync needs curl This fixes a proj compilation error from paraview * tiff does not set TIFF_INCLUDE_DIR tested by proj * TIFF patch exists for proj 9.2 * Add comments with location of proj patch * Use TIFF patches for different cmake versions * Use modules starting cmake 3.28 and variables before that * Fix black style * Simpler patches, add newer proj * Remove duplicated flag * Deprecate PROJ 4.8 and older * Remove PRIVATE * Deprecate PROJ 7.0.0 --------- Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
20 lines
796 B
Diff
20 lines
796 B
Diff
--- a/src/lib_proj.cmake 2024-06-12 13:29:53
|
|
+++ b/src/lib_proj.cmake 2024-06-12 13:30:27
|
|
@@ -406,8 +406,14 @@
|
|
|
|
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})
|
|
+ if( CMAKE_VERSION VERSION_LESS 3.11 AND CMAKE_CROSSCOMPILING )
|
|
+ # Hack needed for ubuntu:18.04 mingw64 cross compiling to avoid
|
|
+ # -isystem to be emitted (similar to https://discourse.cmake.org/t/use-of-isystem/1574)
|
|
+ target_include_directories(proj PRIVATE ${TIFF_INCLUDE_DIRS})
|
|
+ target_link_libraries(proj ${TIFF_LIBRARIES})
|
|
+ else()
|
|
+ target_link_libraries(proj TIFF::TIFF)
|
|
+ endif()
|
|
endif()
|
|
|
|
if(CURL_ENABLED)
|