From 48d03f73446a5475f0b0f4e42c234a72bb371125 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 10 Jan 2025 18:28:47 +0100 Subject: [PATCH] Make user tools symlinks relative Fixes: QTBUG-132724 Change-Id: I0f1d95ef6b66c81e2d12730eae3d5c0452a3a7a1 Reviewed-by: Alexandru Croitor (cherry picked from commit 6a4df2ac243d54f36ad1c1b406803e6caa1be294) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit d45687f4999f6ca6a7449b0124348c74588819c2) --- cmake/QtPostProcessHelpers.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 55506e9fce5..6ee67814eef 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -926,6 +926,7 @@ function(qt_internal_generate_user_facing_tools_info) if("${INSTALL_PUBLICBINDIR}" STREQUAL "") return() endif() + qt_path_join(tool_link_base_dir "${CMAKE_INSTALL_PREFIX}" "${INSTALL_PUBLICBINDIR}") get_property(user_facing_tool_targets GLOBAL PROPERTY QT_USER_FACING_TOOL_TARGETS) set(lines "") foreach(target ${user_facing_tool_targets}) @@ -942,6 +943,7 @@ function(qt_internal_generate_user_facing_tools_info) endif() qt_path_join(tool_target_path "${CMAKE_INSTALL_PREFIX}" "${INSTALL_BINDIR}" "${filename}") qt_path_join(tool_link_path "${INSTALL_PUBLICBINDIR}" "${linkname}${PROJECT_VERSION_MAJOR}") + _qt_internal_relative_path(tool_target_path BASE_DIRECTORY ${tool_link_base_dir}) list(APPEND lines "${tool_target_path} ${tool_link_path}") endforeach() string(REPLACE ";" "\n" content "${lines}")