Skip to content

Commit fb8a910

Browse files
authoredJan 29, 2025
Merge pull request OSGeo#11754 from rouault/fix_11745
Move swig/python/data/template_tiles.mapml to gcore/data
2 parents 5b5adef + 00413e8 commit fb8a910

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed
 

‎gcore/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ set(GDAL_DATA_FILES
239239
${CMAKE_CURRENT_SOURCE_DIR}/data/tms_MapML_APSTILE.json
240240
${CMAKE_CURRENT_SOURCE_DIR}/data/tms_MapML_CBMTILE.json
241241
${CMAKE_CURRENT_SOURCE_DIR}/data/tms_NZTM2000.json
242+
${CMAKE_CURRENT_SOURCE_DIR}/data/template_tiles.mapml
242243
)
243244
set_property(
244245
TARGET ${GDAL_LIB_TARGET_NAME}

‎swig/python/CMakeLists.txt

-9
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ if (CMAKE_CXX_FLAGS)
55
string(REPLACE "/WX " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
66
endif ()
77

8-
set(GDAL_DATA_FILES
9-
LICENSE.TXT
10-
${CMAKE_CURRENT_SOURCE_DIR}/data/template_tiles.mapml
11-
)
12-
set_property(
13-
TARGET ${GDAL_LIB_TARGET_NAME}
14-
APPEND
15-
PROPERTY RESOURCE "${GDAL_DATA_FILES}")
16-
178
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/osgeo/")
189
set(GDAL_PYTHON_CSOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/extensions/")
1910
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/extensions/")

0 commit comments

Comments
 (0)