From 286e3093731cd82d4fa6b4d39fadeff21b71f9dc Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 28 May 2025 06:49:13 +0000 Subject: [PATCH] Revert "CMake: Make generated pkgconfig files relocatable" This reverts commit 731d9a13956ef40e3f563f5ff5ff5c250b8d6d94. Reason for revert: ${pcfiledir} cannot be used, because this leads to wrong prefix values if PKG_CONFIG_SYSROOT_DIR is set. See the comments of the associated task for instances of this problem in other projects. Pick-to: 6.8 6.9 Task-number: QTBUG-136210 Change-Id: I2a60946828f07866b931dacfe0ef81346f1aac9d Reviewed-by: Alexandru Croitor --- cmake/PkgConfigLibrary.pc.in | 2 +- cmake/QtPkgConfigHelpers.cmake | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake/PkgConfigLibrary.pc.in b/cmake/PkgConfigLibrary.pc.in index 5a6665c85c5..b840e79e794 100644 --- a/cmake/PkgConfigLibrary.pc.in +++ b/cmake/PkgConfigLibrary.pc.in @@ -1,4 +1,4 @@ -prefix=${pcfiledir}/@relative_install_prefix@ +prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} bindir=${prefix}/@INSTALL_BINDIR@ libexecdir=${prefix}/@INSTALL_LIBEXECDIR@ diff --git a/cmake/QtPkgConfigHelpers.cmake b/cmake/QtPkgConfigHelpers.cmake index a0eff0d6a2c..2790498bf2c 100644 --- a/cmake/QtPkgConfigHelpers.cmake +++ b/cmake/QtPkgConfigHelpers.cmake @@ -125,9 +125,6 @@ function(qt_internal_generate_pkg_config_file module) qt_path_join(pc_step1_path "${build_dir}" ${step_prefix}_step1.pc) qt_path_join(pc_step2_path "${build_dir}" ${step_prefix}_$_step2.pc) - file(RELATIVE_PATH relative_install_prefix "/${path_suffix}" "/foo") - get_filename_component(relative_install_prefix "${relative_install_prefix}" DIRECTORY) - configure_file("${template_pc}" "${pc_step1_path}" @ONLY) file(GENERATE OUTPUT "${pc_step2_path}" INPUT "${pc_step1_path}")