From c591c2cd26bc551cdf0d61cb3ca79ff264c54a7b Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 14 Mar 2024 10:21:38 +0100 Subject: [PATCH] [pkg-config] add private optional link libraries --- client/CMakeLists.txt | 5 +++++ client/freerdp-client.pc.in | 2 +- libfreerdp/CMakeLists.txt | 3 +++ libfreerdp/freerdp.pc.in | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index fcb0d403c..1a8f34712 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -92,6 +92,11 @@ if(WITH_CLIENT) endforeach() endif() +if (WITH_FUSE) + list(APPEND FREERDP_CLIENT_PC_PRIVATE_LIBS "-lfuse3") +endif() + +list(JOIN FREERDP_CLIENT_PC_PRIVATE_LIBS " " FREERDP_CLIENT_PC_PRIVATE_LIBS) include(pkg-config-install-prefix) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp-client.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp-client${FREERDP_VERSION_MAJOR}.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp-client${FREERDP_VERSION_MAJOR}.pc DESTINATION ${PKG_CONFIG_PC_INSTALL_DIR}) diff --git a/client/freerdp-client.pc.in b/client/freerdp-client.pc.in index eca4ab897..e446657cf 100644 --- a/client/freerdp-client.pc.in +++ b/client/freerdp-client.pc.in @@ -11,5 +11,5 @@ Version: @FREERDP_VERSION@ Requires: Requires.private: @WINPR_PKG_CONFIG_FILENAME@ freerdp@FREERDP_VERSION_MAJOR@ Libs: -L${libdir} ${libs} -Libs.private: -ldl -lpthread +Libs.private: -ldl -lpthread @FREERDP_CLIENT_PC_PRIVATE_LIBS@ Cflags: -I${includedir} diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index 30fb00ed8..d08402a27 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -480,10 +480,13 @@ include(pkg-config-install-prefix) set(FREERDP_REQUIRES_PRIVATE "") if(cJSON_FOUND) string(APPEND FREERDP_REQUIRES_PRIVATE " libcjson") + list(APPEND FREERDP_PC_PRIVATE_LIBS "-lcjson") endif() if(WITH_SMARTCARD_EMULATE) string(APPEND FREERDP_REQUIRES_PRIVATE " zlib") + list(APPEND FREERDP_PC_PRIVATE_LIBS "-lz") endif() +list(JOIN FREERDP_PC_PRIVATE_LIBS " " FREERDP_PC_PRIVATE_LIBS) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp${FREERDP_VERSION_MAJOR}.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp${FREERDP_VERSION_MAJOR}.pc DESTINATION ${PKG_CONFIG_PC_INSTALL_DIR}) diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in index dcc81fe4b..185ec981a 100644 --- a/libfreerdp/freerdp.pc.in +++ b/libfreerdp/freerdp.pc.in @@ -16,5 +16,5 @@ Version: @FREERDP_VERSION@ Requires: Requires.private: winpr@FREERDP_API_VERSION@ @FREERDP_REQUIRES_PRIVATE@ Libs: -L${libdir} ${libs} -Libs.private: -ldl -lpthread +Libs.private: -ldl -lpthread @FREERDP_PC_PRIVATE_LIBS@ Cflags: -I${includedir}