diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2024-01-09 17:23:59 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-02 18:38:34 +0000 |
| commit | 9537cba4fd715f2856db0dac9b3444d1045aa9ed (patch) | |
| tree | b7fb6a716dec2fb1d79442721340fe38ff6cd9af /cmake | |
| parent | 427c1e114ab2969bfb51b24d0401f7e0286b5873 (diff) | |
Pass PKG_CONFIG_LIBDIR as gn system_libdir arg
PKG_CONFIG_LIBDIR can be set only during configure time by
toolchian file. Therefore, pass it gn as system_libdir arg.
Change-Id: I5b97ced2c4915b67d5c43e4718ba64c3df9c255b
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 674732fd8ac62be3fe04ae5333c809a1ebc74285)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index f9742595c..cbaf0c61e 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -1098,11 +1098,16 @@ endmacro() macro(append_pkg_config_setup) - if(LINUX) + if(PkgConfig_FOUND) list(APPEND gnArgArg pkg_config="${PKG_CONFIG_EXECUTABLE}" host_pkg_config="${PKG_CONFIG_HOST_EXECUTABLE}" ) + if(NOT "$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "") + list(APPEND gnArgArg + system_libdir="$ENV{PKG_CONFIG_LIBDIR}" + ) + endif() endif() endmacro() |