From 333e745d7bfbfb46502b42e3030ce29e26950734 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 1 Oct 2021 20:42:57 +0200 Subject: [PATCH] [CMake] pkg-config: generate correct library link file names --- cmake/MapnikExportPkgConfig.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake index e054de9f2..5649cb107 100644 --- a/cmake/MapnikExportPkgConfig.cmake +++ b/cmake/MapnikExportPkgConfig.cmake @@ -1,4 +1,4 @@ -function(create_pkg_config_file _lib_name _description) +function(create_pkg_config_file _target _lib_name _description) string(CONFIGURE [[ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} @@ -8,7 +8,7 @@ libdir=${exec_prefix}/lib Name: @_lib_name@ Description: @_description@ Version: @MAPNIK_VERSION@ -Libs: -L"${libdir}" -l@_lib_name@ +Libs: -L"${libdir}" -l$$$_POSTFIX> Cflags: -I"${includedir}" ]] _contents @ONLY) @@ -38,7 +38,7 @@ Name: @_lib_name@ Description: @_description@ Version: @MAPNIK_VERSION@ Requires: libmapnikwkt libmapnikjson -Libs: -L"${libdir}" -l@_lib_name@ -llibmapnikwkt -llibmapnikjson +Libs: -L"${libdir}" -l$$$_POSTFIX> -l$$$_POSTFIX> -l$$$_POSTFIX> Cflags: -I"${includedir}" @_str_compile_defs@]] _contents @ONLY) file(GENERATE @@ -52,6 +52,6 @@ Cflags: -I"${includedir}" @_str_compile_defs@]] endfunction() -create_pkg_config_file(libmapnikwkt "wkt library") -create_pkg_config_file(libmapnikjson "json library") +create_pkg_config_file(wkt libmapnikwkt "wkt library") +create_pkg_config_file(json libmapnikjson "json library") create_pkg_config_file_mapnik("libmapnik" "mapnik library")