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

[CMake] fix installation

Browse source
This commit is contained in:
Mathis Logemann 2022-01-27 18:30:13 +01:00
parent c5d4bfe680
commit ccd44da4a2
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmake/MapnikInstall.cmake
View file

@ -70,13 +70,13 @@ function(mapnik_install_targets)
set(_internal_libraries "") set(_internal_libraries "")
foreach(_target IN LISTS _installed_utilities) foreach(_target IN LISTS _installed_utilities)
list(APPEND _internal_executables "${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$<TARGET_FILE_NAME:${_target}>") list(APPEND _internal_executables "\${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$<TARGET_FILE_NAME:${_target}>")
endforeach() endforeach()
foreach(_target IN LISTS _installed_targets) foreach(_target IN LISTS _installed_targets)
list(APPEND _internal_libraries "${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$<TARGET_FILE_NAME:${_target}>") list(APPEND _internal_libraries "\${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$<TARGET_FILE_NAME:${_target}>")
endforeach() endforeach()
foreach(_target IN LISTS _installed_plugins) foreach(_target IN LISTS _installed_plugins)
list(APPEND _internal_libraries "${CMAKE_INSTALL_PREFIX}/${PLUGINS_INSTALL_DIR}/$<TARGET_FILE_NAME:${_target}>") list(APPEND _internal_libraries "\${CMAKE_INSTALL_PREFIX}/${PLUGINS_INSTALL_DIR}/$<TARGET_FILE_NAME:${_target}>")
endforeach() endforeach()
# all other executables get auto detected and fixed. # all other executables get auto detected and fixed.
if(_internal_executables) if(_internal_executables)
@ -84,8 +84,9 @@ function(mapnik_install_targets)
endif() endif()
INSTALL(CODE " INSTALL(CODE "
message(STATUS \"${_internal_executables}\") message(STATUS \"internal_executables: ${_internal_executables}\")
message(STATUS \"${_internal_libraries}\") message(STATUS \"internal_libraries: ${_internal_libraries}\")
message(STATUS \"ADDITIONAL_LIBARIES_PATHS: ${ADDITIONAL_LIBARIES_PATHS}\")
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"${_internal_executables}\" \"${_internal_libraries}\" \"${ADDITIONAL_LIBARIES_PATHS}\") fixup_bundle(\"${_internal_executables}\" \"${_internal_libraries}\" \"${ADDITIONAL_LIBARIES_PATHS}\")

3
cmake/pack.cmake
View file

@ -1,4 +1,7 @@
include(InstallRequiredSystemLibraries) 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_SOURCE_GENERATOR "TGZ")
set(CPACK_GENERATOR "TGZ") set(CPACK_GENERATOR "TGZ")
set(CPACK_SOURCE_IGNORE_FILES set(CPACK_SOURCE_IGNORE_FILES