Move cubewerx_extra.wkt, ecw_cs.wkt, epsg.wkt, esri_StatePlane_extra.…

…wkt, ozi_*.csv, pci_*.csv, sateplace.csv to ogr/data/
OSGeo · Jan 16, 2024 · 7bfceb5 · 7bfceb5
1 parent adc69df
commit 7bfceb5
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 9 deletions.
diff --git a/gdal.cmake b/gdal.cmake
@@ -655,16 +655,7 @@ set(GDAL_DATA_FILES
     data/GDALLogoBW.svg
     data/GDALLogoColor.svg
     data/GDALLogoGS.svg
-    data/cubewerx_extra.wkt
-    data/ecw_cs.wkt
-    data/epsg.wkt
-    data/esri_StatePlane_extra.wkt
     data/gdalicon.png
-    data/ozi_datum.csv
-    data/ozi_ellips.csv
-    data/pci_datum.txt
-    data/pci_ellips.txt
-    data/stateplane.csv
     data/template_tiles.mapml
     data/tms_LINZAntarticaMapTileGrid.json
     data/tms_MapML_APSTILE.json

diff --git a/ogr/CMakeLists.txt b/ogr/CMakeLists.txt
@@ -62,6 +62,23 @@ add_library(
   ogr_wkb.cpp)
 add_dependencies(ogr generate_gdal_version_h)
 
+set(GDAL_DATA_FILES
+    LICENSE.TXT
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/cubewerx_extra.wkt
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/ecw_cs.wkt
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/epsg.wkt
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/esri_StatePlane_extra.wkt
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/ozi_datum.csv
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/ozi_ellips.csv
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/pci_datum.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/pci_ellips.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/stateplane.csv
+)
+set_property(
+  TARGET ${GDAL_LIB_TARGET_NAME}
+  APPEND
+  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+
 include(GdalStandardIncludes)
 gdal_standard_includes(ogr)
 target_compile_options(ogr PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX})

diff --git a/data/cubewerx_extra.wkt → ogr/data/cubewerx_extra.wkt b/data/cubewerx_extra.wkt → ogr/data/cubewerx_extra.wkt
diff --git a/data/ecw_cs.wkt → ogr/data/ecw_cs.wkt b/data/ecw_cs.wkt → ogr/data/ecw_cs.wkt
diff --git a/data/epsg.wkt → ogr/data/epsg.wkt b/data/epsg.wkt → ogr/data/epsg.wkt
diff --git a/data/esri_StatePlane_extra.wkt → ogr/data/esri_StatePlane_extra.wkt b/data/esri_StatePlane_extra.wkt → ogr/data/esri_StatePlane_extra.wkt
diff --git a/data/ozi_datum.csv → ogr/data/ozi_datum.csv b/data/ozi_datum.csv → ogr/data/ozi_datum.csv
diff --git a/data/ozi_ellips.csv → ogr/data/ozi_ellips.csv b/data/ozi_ellips.csv → ogr/data/ozi_ellips.csv
diff --git a/data/pci_datum.txt → ogr/data/pci_datum.txt b/data/pci_datum.txt → ogr/data/pci_datum.txt
diff --git a/data/pci_ellips.txt → ogr/data/pci_ellips.txt b/data/pci_ellips.txt → ogr/data/pci_ellips.txt
diff --git a/data/stateplane.csv → ogr/data/stateplane.csv b/data/stateplane.csv → ogr/data/stateplane.csv