From 7d8be299f3b868f9409f11654d1c8ca2d52dc8b2 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Wed, 3 Aug 2022 16:19:07 +0100 Subject: [PATCH] Fix font installation logic --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 726e97032..d87a7052d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,7 @@ endif() set(PLUGINS_INSTALL_DIR ${DEFAULT_PLUGINS_INSTALL_DIR} CACHE STRING "installs the plugins in the specified directory") message(STATUS "Installing plugins to ${PLUGINS_INSTALL_DIR}") -set(FONTS_INSTALL_DIR ${MAPNIK_BIN_DIR}/fonts CACHE STRING "installs the fonts in the specified directory") +set(FONTS_INSTALL_DIR ${MAPNIK_LIB_DIR}/mapnik/fonts CACHE STRING "installs the fonts in the specified directory") message(STATUS "Installing fonts to ${FONTS_INSTALL_DIR}") set(MAPNIK_COMPILE_DEFS "") @@ -399,7 +399,8 @@ include(MapnikExportPkgConfig) install(DIRECTORY include/ DESTINATION ${MAPNIK_INCLUDE_DIR}) install(DIRECTORY deps/agg/include/ DESTINATION ${MAPNIK_INCLUDE_DIR}) install(DIRECTORY deps/mapnik DESTINATION ${MAPNIK_INCLUDE_DIR}) -install(DIRECTORY fonts/ DESTINATION ${FONTS_INSTALL_DIR} FILES_MATCHING PATTERN "*.py" EXCLUDE PATTERN "*") +file(GLOB TTF_FONT_FILES "fonts/*/*/*.ttf") +install(FILES ${TTF_FONT_FILES} DESTINATION ${FONTS_INSTALL_DIR}) if(NOT USE_EXTERNAL_MAPBOX_GEOMETRY) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/geometry/include/ DESTINATION ${MAPNIK_INCLUDE_DIR})