From 3626981d8e971ca3a0f6817030462ad6e992b206 Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Tue, 23 May 2023 12:05:48 +0200 Subject: [PATCH] new [libfreerdp]: use compile time paths in FreeRDP cmake module The exported paths for * FreeRDP_PLUGIN_DIR * FreeRDP_PROXY_PLUGIN_DIR * FreeRDP_EXTENSION_DIR introduced in ddc9e5835ff879a7562447a0d62f3951c7dbb98e were relative to the installation of the cmake module because of the use of CMakePackageConfigHelpers. This could lead to different paths for configuration and runtime - causing channels not to be found and loaded. Instead of using paths relative to the cmake module set the paths configured during configure/compile for plugins and extension. This way the exported paths match the paths in build-config.h and are the same used in the pkg-config variables. --- libfreerdp/FreeRDPConfig.cmake.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in index 45d6f113c..12e39356c 100644 --- a/libfreerdp/FreeRDPConfig.cmake.in +++ b/libfreerdp/FreeRDPConfig.cmake.in @@ -6,7 +6,10 @@ set(FreeRDP_VERSION_MINOR "@FREERDP_VERSION_MINOR@") set(FreeRDP_VERSION_REVISION "@FREERDP_VERSION_REVISION@") set_and_check(FreeRDP_INCLUDE_DIR "@PACKAGE_FREERDP_INCLUDE_DIR@") -set(FreeRDP_PLUGIN_DIR "@PACKAGE_FREERDP_PLUGIN_PATH@") + +set(FreeRDP_INSTALL_PREFIX "@FREERDP_INSTALL_PREFIX@") +set(FreeRDP_RELATIVE_PLUGIN_DIR "@FREERDP_PLUGIN_PATH@") +set(FreeRDP_PLUGIN_DIR "${FreeRDP_INSTALL_PREFIX}/${FreeRDP_RELATIVE_PLUGIN_DIR}") set(FreeRDP_PROXY_PLUGIN_DIR "${FreeRDP_PLUGIN_DIR}/proxy") set(FreeRDP_EXTENSION_DIR "${FreeRDP_PLUGIN_DIR}/extensions")