Merge pull request #11756 from OSGeo/backport-11754-to-release/3.10

[Backport release/3.10] Move swig/python/data/template_tiles.mapml to gcore/data
OSGeo · Jan 30, 2025 · 784fa91 · 784fa91
2 parents 952ad8c + c8054d3
commit 784fa91
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/gcore/CMakeLists.txt b/gcore/CMakeLists.txt
@@ -201,6 +201,7 @@ set(GDAL_DATA_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tms_MapML_APSTILE.json
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tms_MapML_CBMTILE.json
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tms_NZTM2000.json
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/template_tiles.mapml
 )
 set_property(
   TARGET ${GDAL_LIB_TARGET_NAME}

diff --git a/swig/python/data/template_tiles.mapml → gcore/data/template_tiles.mapml b/swig/python/data/template_tiles.mapml → gcore/data/template_tiles.mapml
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
@@ -5,15 +5,6 @@ if (CMAKE_CXX_FLAGS)
   string(REPLACE "/WX " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
 endif ()
 
-set(GDAL_DATA_FILES
-    LICENSE.TXT
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/template_tiles.mapml
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
-
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/osgeo/")
 set(GDAL_PYTHON_CSOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/extensions/")
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/extensions/")