sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not use absolute paths for fonts/plugins

Browse source
This commit is contained in:
Mathis Logemann 2020-11-25 13:20:07 +01:00
parent b3a34de3ce
commit 410393fefa
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
CMakeLists.txt
View file

@ -47,19 +47,6 @@ option(BUILD_UTILITY_PGSQL2SQLITE "builds the utility program pgsql2sqlite" ON)
option(BUILD_UTILITY_SHAPEINDEX "builds the utility program shapeindex" ON) option(BUILD_UTILITY_SHAPEINDEX "builds the utility program shapeindex" ON)
option(BUILD_UTILITY_SVG2PNG "builds the utility program svg2png" ON) option(BUILD_UTILITY_SVG2PNG "builds the utility program svg2png" ON)
if(WIN32)
set(DEFAULT_PLUGINS_INSTALL_DIR bin/mapnik/input)
else()
set(DEFAULT_PLUGINS_INSTALL_DIR lib/mapnik/input)
endif()
set(PLUGINS_INSTALL_DIR ${DEFAULT_PLUGINS_INSTALL_DIR} CACHE STRING "installs the plugins in the specified directory")
get_filename_component(ABSOLUTE_PLUGINS_INSTALL_DIR ${PLUGINS_INSTALL_DIR} ABSOLUTE)
message("Installing plugins to ${ABSOLUTE_PLUGINS_INSTALL_DIR}")
set(FONTS_INSTALL_DIR bin/fonts CACHE STRING "installs the fonts in the specified directory")
get_filename_component(ABSOLUTE_FONTS_INSTALL_DIR ${FONTS_INSTALL_DIR} ABSOLUTE)
message("Installing fonts to ${ABSOLUTE_FONTS_INSTALL_DIR}")
set(CMAKE_CXX_STANDARD 14 CACHE STRING "Sets the c++ standard. c++11 is minimum.") set(CMAKE_CXX_STANDARD 14 CACHE STRING "Sets the c++ standard. c++11 is minimum.")
message("Using c++${CMAKE_CXX_STANDARD}") message("Using c++${CMAKE_CXX_STANDARD}")
@ -80,6 +67,19 @@ set(MAPNIK_LIB_DIR ${DEFAULT_LIB_DIR} CACHE STRING "Install directory for librar
# https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html#archive-output-artifacts # https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html#archive-output-artifacts
set(MAPNIK_ARCHIVE_DIR ${DEFAULT_ARCHIVE_DIR} CACHE STRING "Install directory for archives") set(MAPNIK_ARCHIVE_DIR ${DEFAULT_ARCHIVE_DIR} CACHE STRING "Install directory for archives")
set(INSTALL_CMAKE_DIR ${MAPNIK_LIB_DIR}/mapnik/cmake CACHE STRING "Install directory of the cmake targets")
if(WIN32)
set(DEFAULT_PLUGINS_INSTALL_DIR ${MAPNIK_BIN_DIR}/mapnik/input)
else()
set(DEFAULT_PLUGINS_INSTALL_DIR ${MAPNIK_LIB_DIR}/mapnik/input)
endif()
set(PLUGINS_INSTALL_DIR ${DEFAULT_PLUGINS_INSTALL_DIR} CACHE STRING "installs the plugins in the specified directory")
message("Installing plugins to ${PLUGINS_INSTALL_DIR}")
set(FONTS_INSTALL_DIR ${MAPNIK_BIN_DIR}/fonts CACHE STRING "installs the fonts in the specified directory")
message("Installing fonts to ${FONTS_INSTALL_DIR}")
find_package(Boost 1.74 REQUIRED COMPONENTS filesystem system regex) find_package(Boost 1.74 REQUIRED COMPONENTS filesystem system regex)
find_package(ICU REQUIRED COMPONENTS uc) find_package(ICU REQUIRED COMPONENTS uc)
find_package(Freetype REQUIRED) find_package(Freetype REQUIRED)
@ -228,9 +228,9 @@ target_compile_definitions(headers INTERFACE ${MAPNIK_COMPILE_DEFS})
install(TARGETS headers install(TARGETS headers
EXPORT MapnikTargets EXPORT MapnikTargets
LIBRARY DESTINATION lib LIBRARY DESTINATION ${MAPNIK_LIB_DIR}
ARCHIVE DESTINATION lib ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR}
RUNTIME DESTINATION bin RUNTIME DESTINATION ${MAPNIK_BIN_DIR}
INCLUDES DESTINATION include/ INCLUDES DESTINATION include/
PUBLIC_HEADER DESTINATION include/ PUBLIC_HEADER DESTINATION include/
) )
@ -249,7 +249,6 @@ endif()
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
# set the cmake targets install location # set the cmake targets install location
set(INSTALL_CMAKE_DIR lib/cmake)
set(INCLUDE_INSTALL_DIR include/) set(INCLUDE_INSTALL_DIR include/)
write_basic_package_version_file( write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/MapnikConfigVersion.cmake"

4
demo/viewer/CMakeLists.txt
View file

@ -35,8 +35,8 @@ target_link_libraries(mapnik-viewer PRIVATE
) )
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini
"[mapnik] "[mapnik]
plugins_dir=${ABSOLUTE_PLUGINS_INSTALL_DIR} plugins_dir=${PLUGINS_INSTALL_DIR}
fonts/1/dir=${ABSOLUTE_FONTS_INSTALL_DIR}" fonts/1/dir=${FONTS_INSTALL_DIR}"
) )
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini DESTINATION bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini DESTINATION bin)
install(TARGETS mapnik-viewer install(TARGETS mapnik-viewer