From 96be84d703fb6b0c9ab95040b53c3b78b7a06ce7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 13 Jun 2022 11:25:34 +0200 Subject: [PATCH] CMake: Take custom libdir into account When configuring with -libdir set to something that is not recognized by CMake's find_package search procedure, top-level builds failed to configure. This was due to a hard-coded lib/cmake directory added to CMAKE_PREFIX_PATH. Fixes: QTBUG-103823 Pick-to: 6.2 6.3 6.4 Change-Id: If8b48e35e654089f32cbe4af9936238cd82b3dbb Reviewed-by: Alexandru Croitor --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88e440a2..70d67220 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES) if(module STREQUAL "qtbase") if (NOT QT_BUILD_STANDALONE_TESTS) - list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake") + list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/${INSTALL_LIBDIR}/cmake") list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}") endif() endif()