Changeset: b18d5a1bbcb7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b18d5a1bbcb7
Modified Files:
sql/backends/monet5/vaults/shp/CMakeLists.txt
Branch: copybinary
Log Message:
GDAL fix for older cmake versions
diffs (20 lines):
diff --git a/sql/backends/monet5/vaults/shp/CMakeLists.txt
b/sql/backends/monet5/vaults/shp/CMakeLists.txt
--- a/sql/backends/monet5/vaults/shp/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/shp/CMakeLists.txt
@@ -32,7 +32,7 @@ if(GDAL_FOUND)
$<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:sqlstorage,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:geomlib,INTERFACE_INCLUDE_DIRECTORIES>
- $<$<VERSION_LESS:${CMAKE_VERSION},3.14.0>:${GDAL_INCLUDE_DIRS}>
+ $<$<VERSION_LESS:${CMAKE_VERSION},3.14.0>:${GDAL_INCLUDE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
@@ -43,6 +43,7 @@ if(GDAL_FOUND)
bat
monetdb5
sqlinclude
+ $<$<VERSION_LESS:${CMAKE_VERSION},3.14.0>:${GDAL_LIBRARY}>
$<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.14.0>:GDAL::GDAL>)
set_target_properties(shp
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
