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

Add QT_BUILD_DIR to the cmake configure option list

Browse Source 
The variable is required to calculate the inner CMake prefixes when
building the Qt CMake tests inside Qt CMake tests. Otherwise the prefix
path remain empty and CMake attempts looking for Qt by the system
paths.

This fixes Qt CMake tests when running them as part of non-prefixed
build tree.

Pick-to: 6.7
Change-Id: I8908ab0b47fe37044ccb2a950d8973790e4fd174
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit f80c0f1f944ab5af6efef71306692cb1e916930c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2024-09-18 12:27:48 +02:00 committed by Qt Cherry-pick Bot
parent 44f5e46650
commit 4034c896de
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/Qt6CTestMacros.cmake
View File

@ -125,6 +125,9 @@ function(_qt_internal_get_cmake_test_configure_options out_var)
list(APPEND option_list "-DCMAKE_MESSAGE_LOG_LEVEL=DEBUG")
list(APPEND option_list "-DCMAKE_AUTOGEN_VERBOSE=TRUE")
if(QT_BUILD_DIR)
list(APPEND option_list "-DQT_BUILD_DIR=${QT_BUILD_DIR}")
endif()
if(APPLE AND CMAKE_OSX_ARCHITECTURES)
list(LENGTH CMAKE_OSX_ARCHITECTURES osx_arch_count)