Move NITF data files to frmts/nitf/data

OSGeo · Jan 16, 2024 · b718220 · b718220
1 parent be9e61c
commit b718220
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
@@ -151,6 +151,6 @@ jobs:
 
       - name: Run xmllint checks
         run: |
-          xmllint --schema ./data/nitf_spec.xsd ./data/nitf_spec.xml --noout
+          xmllint --schema ./frmts/nitf/data/nitf_spec.xsd ./frmts/nitf/data/nitf_spec.xml --noout
           xmllint --schema ./ogr/ogrsf_frmts/vdv/data/vdv452.xsd ./ogr/ogrsf_frmts/vdv/data/vdv452.xml --noout
           xmllint --schema ./ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd ./ogr/ogrsf_frmts/gmlas/data/gmlasconf.xml --noout
diff --git a/frmts/nitf/CMakeLists.txt b/frmts/nitf/CMakeLists.txt
@@ -20,6 +20,15 @@ add_gdal_driver(
           "NOT GDAL_USE_JPEG_INTERNAL\\\;NOT GDAL_USE_JPEG12_INTERNAL\\\;NOT GDAL_USE_TIFF_INTERNAL"
 )
 
+set(GDAL_DATA_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/nitf_spec.xml
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/nitf_spec.xsd
+)
+set_property(
+  TARGET ${GDAL_LIB_TARGET_NAME}
+  APPEND
+  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+
 if(NOT TARGET gdal_NITF)
     return()
 endif()

diff --git a/data/nitf_spec.xml → frmts/nitf/data/nitf_spec.xml b/data/nitf_spec.xml → frmts/nitf/data/nitf_spec.xml
diff --git a/data/nitf_spec.xsd → frmts/nitf/data/nitf_spec.xsd b/data/nitf_spec.xsd → frmts/nitf/data/nitf_spec.xsd
diff --git a/gdal.cmake b/gdal.cmake
@@ -668,8 +668,6 @@ set(GDAL_DATA_FILES
     data/gt_datum.csv
     data/gt_ellips.csv
     data/netcdf_config.xsd
-    data/nitf_spec.xml
-    data/nitf_spec.xsd
     data/ogrvrt.xsd
     data/ogrinfo_output.schema.json
     data/ozi_datum.csv