1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Make generated pkgconfig files relocatable

Browse Source 
Don't write an absolute prefix into generated .pc files but one that's
relative to ${pcfiledir}. This makes the files relocatable, and we don't
have to patch them in the Qt online installer.

Fixes: QTBUG-136210
Change-Id: I5c2f9398917be03f6c63286e553c87ff52971285
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 731d9a13956ef40e3f563f5ff5ff5c250b8d6d94)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2025-05-07 15:22:12 +02:00 committed by Jani Heikkinen
parent 0b84ad4e49
commit 5b6527c35a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/PkgConfigLibrary.pc.in
View File

@ -1,4 +1,4 @@
prefix=@CMAKE_INSTALL_PREFIX@
prefix=${pcfiledir}/@relative_install_prefix@
exec_prefix=${prefix}
bindir=${prefix}/@INSTALL_BINDIR@
libexecdir=${prefix}/@INSTALL_LIBEXECDIR@

3
cmake/QtPkgConfigHelpers.cmake
View File

@ -125,6 +125,9 @@ 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}_$<CONFIG>_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}")