diff options
| author | Jani Heikkinen <[email protected]> | 2025-05-28 10:22:57 +0000 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2025-05-28 15:04:37 +0000 |
| commit | 2ad23cd72d5f122f88ce95792a4323d639c27d25 (patch) | |
| tree | dde6eb3882dad8d4501d23c6021e1924f1ed3da7 | |
| parent | 1cd79cf4293176f24f80100e888feba3deccd0ff (diff) | |
This reverts commit 5b6527c35a5d86fbaac02ed1881134a921e38323.
Reason for revert: ${pcfiledir} cannot be used, because this
leads to wrong prefix values if PKG_CONFIG_SYSROOT_DIR is set.
Change-Id: Ie22607b2c4195dc197f1058d6b0fc1407427e7ac
Reviewed-by: Alexandru Croitor <[email protected]>
| -rw-r--r-- | cmake/PkgConfigLibrary.pc.in | 2 | ||||
| -rw-r--r-- | cmake/QtPkgConfigHelpers.cmake | 3 |
2 files changed, 1 insertions, 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}_$<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}") |