From 00413e8ff4a50305852cd838f4a30f8d67bcfd8e Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 29 Jan 2025 18:47:28 +0100 Subject: [PATCH] Move swig/python/data/template_tiles.mapml to gcore/data to avoid issues with conda-forge builds. One could argue this is a conda-forge build recipee bug, but it is easier to fix it that way Fixes #11745 --- gcore/CMakeLists.txt | 1 + {swig/python => gcore}/data/template_tiles.mapml | 0 swig/python/CMakeLists.txt | 9 --------- 3 files changed, 1 insertion(+), 9 deletions(-) rename {swig/python => gcore}/data/template_tiles.mapml (100%) diff --git a/gcore/CMakeLists.txt b/gcore/CMakeLists.txt index 325e34d1049a..3fb967e42220 100644 --- a/gcore/CMakeLists.txt +++ b/gcore/CMakeLists.txt @@ -239,6 +239,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 b/gcore/data/template_tiles.mapml similarity index 100% rename from swig/python/data/template_tiles.mapml rename to gcore/data/template_tiles.mapml diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt index 1e37b57e674e..955968596f00 100644 --- 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/")