summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2024-01-09 17:23:59 +0100
committerMichal Klocek <michal.klocek@qt.io>2024-02-02 14:30:39 +0100
commit674732fd8ac62be3fe04ae5333c809a1ebc74285 (patch)
tree591381824e01d7460a3cce1811980fe0e991fef7 /cmake
parent60e1d02fbab580c819630a69b987f5ca0622ca49 (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. Pick-to: 6.7 Change-Id: I5b97ced2c4915b67d5c43e4718ba64c3df9c255b Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Functions.cmake7
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()