Add QT_BUILD_DIR to the cmake configure option list

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 6.8 Change-Id: I8908ab0b47fe37044ccb2a950d8973790e4fd174 Reviewed-by: Tor Arne Vestbø <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
qt · Sep 18, 2024 · f80c0f1 · f80c0f1
1 parent b68b3e7
commit f80c0f1
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/corelib/Qt6CTestMacros.cmake b/src/corelib/Qt6CTestMacros.cmake
@@ -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)