From ccd44da4a2fc7d0189b276887931649b4c4f67c2 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 27 Jan 2022 18:30:13 +0100 Subject: [PATCH] [CMake] fix installation --- cmake/MapnikInstall.cmake | 11 ++++++----- cmake/pack.cmake | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake/MapnikInstall.cmake b/cmake/MapnikInstall.cmake index eb343032d..0953c09db 100644 --- a/cmake/MapnikInstall.cmake +++ b/cmake/MapnikInstall.cmake @@ -70,13 +70,13 @@ function(mapnik_install_targets) set(_internal_libraries "") foreach(_target IN LISTS _installed_utilities) - list(APPEND _internal_executables "${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$") + list(APPEND _internal_executables "\${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$") endforeach() foreach(_target IN LISTS _installed_targets) - list(APPEND _internal_libraries "${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$") + list(APPEND _internal_libraries "\${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$") endforeach() foreach(_target IN LISTS _installed_plugins) - list(APPEND _internal_libraries "${CMAKE_INSTALL_PREFIX}/${PLUGINS_INSTALL_DIR}/$") + list(APPEND _internal_libraries "\${CMAKE_INSTALL_PREFIX}/${PLUGINS_INSTALL_DIR}/$") endforeach() # all other executables get auto detected and fixed. if(_internal_executables) @@ -84,8 +84,9 @@ function(mapnik_install_targets) endif() INSTALL(CODE " - message(STATUS \"${_internal_executables}\") - message(STATUS \"${_internal_libraries}\") + message(STATUS \"internal_executables: ${_internal_executables}\") + message(STATUS \"internal_libraries: ${_internal_libraries}\") + message(STATUS \"ADDITIONAL_LIBARIES_PATHS: ${ADDITIONAL_LIBARIES_PATHS}\") include(BundleUtilities) fixup_bundle(\"${_internal_executables}\" \"${_internal_libraries}\" \"${ADDITIONAL_LIBARIES_PATHS}\") diff --git a/cmake/pack.cmake b/cmake/pack.cmake index eb27bda41..1544e5018 100644 --- a/cmake/pack.cmake +++ b/cmake/pack.cmake @@ -1,4 +1,7 @@ include(InstallRequiredSystemLibraries) +set(CPACK_PACKAGE_NAME "mapnik") +set(CPACK_PACKAGE_HOMEPAGE_URL "https://mapnik.org") +set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") set(CPACK_SOURCE_GENERATOR "TGZ") set(CPACK_GENERATOR "TGZ") set(CPACK_SOURCE_IGNORE_FILES