From 95b397d52e99a0d602b094a97669d1c9ae754e81 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 13 Oct 2020 01:09:26 +0300 Subject: [PATCH] GeneratePkgConfig: minor variable expansion fixes. GitOrigin-RevId: 7b04158cc1262040fb5a9ebd33df50571e63b529 --- CMake/GeneratePkgConfig.cmake | 8 ++++---- CMakeLists.txt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMake/GeneratePkgConfig.cmake b/CMake/GeneratePkgConfig.cmake index 6bd33f60b..6d68c1c0e 100644 --- a/CMake/GeneratePkgConfig.cmake +++ b/CMake/GeneratePkgConfig.cmake @@ -1,10 +1,10 @@ function(get_relative_link OUTPUT PATH) get_filename_component(NAME ${PATH} NAME_WE) - if (${PATH} MATCHES "^[$]<[$]:") + if (PATH MATCHES "^[$]<[$]:") set(LINK "") - elseif (NOT WIN32 AND ${NAME} MATCHES "^lib") + elseif (NOT WIN32 AND NAME MATCHES "^lib") string(REGEX REPLACE "^lib" "-l" LINK ${NAME}) - elseif (${NAME} MATCHES "^-") + elseif (NAME MATCHES "^-") set(LINK ${NAME}) else() string(CONCAT LINK "-l" ${NAME}) @@ -50,7 +50,7 @@ function(generate_pkgconfig TARGET DESCRIPTION) endif() file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig") - file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/${TARGET}.pc" CONTENT + file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/${TARGET}.pc" CONTENT "prefix=${PREFIX} Name: ${TARGET} diff --git a/CMakeLists.txt b/CMakeLists.txt index fce085173..bf0e1b38b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -999,9 +999,9 @@ if (TD_ENABLE_DOTNET) endif() # generate_pkgconfig(tdc "Telegram Library - C interface") generate_pkgconfig(tdapi "Telegram Library - API") -generate_pkgconfig(tdjson_private "Telegram Library - Json Interface (private)") -generate_pkgconfig(tdjson "Telegram Library - Json Interface (shared)") -generate_pkgconfig(tdjson_static "Telegram Library - Json Interface (static)") +generate_pkgconfig(tdjson_private "Telegram Library - JSON interface (private)") +generate_pkgconfig(tdjson "Telegram Library - JSON interface (shared)") +generate_pkgconfig(tdjson_static "Telegram Library - JSON interface (static)") install(EXPORT TdTargets FILE TdTargets.cmake