diff options
| author | Alexey Edelev <[email protected]> | 2023-08-22 19:11:30 +0200 |
|---|---|---|
| committer | Alexey Edelev <[email protected]> | 2023-09-01 11:12:23 +0000 |
| commit | d4eda5d34d29c965e625300e2136250fabd0aee5 (patch) | |
| tree | c0b2c04628d3f9807460d74e5a89bd547777d0c3 | |
| parent | 801b8304fbbe09b3c05c4adf5c14a76f05daafcb (diff) | |
Make sure that tests use the module build directory but not install path
If we configure module that is already installed it's expected that
tests use the build directory to resolve all the depdencies, but not
the install directory. This is especially sensetive if the module cmake
scripts were changed.
This changes the order of find_<package|dependency> PATHS that are
used to locate Qt package. QT_EXAMPLES_CMAKE_PREFIX_PATH now is used at
first, so we guarantee that we look into the build directory at
first place. This trick only works if build directory is added to
CMAKE_FIND_ROOT_PATH. The reason for that is the internal CMake logic
that tries to relocate the search PATHs and put the paths that are
subdirs of or exact CMAKE_FIND_ROOT_PATH higher in search list.
Fixes: QTBUG-115730
Change-Id: Icab721f0a6eac7301c626350ab214cc4545b368b
Reviewed-by: Alexandru Croitor <[email protected]>
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtConfig.cmake.in | 2 | ||||
| -rw-r--r-- | cmake/QtModuleDependencies.cmake.in | 2 | ||||
| -rw-r--r-- | cmake/QtPublicDependencyHelpers.cmake | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 0038e17e934..3bdb6488318 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -718,6 +718,7 @@ macro(qt_build_tests) # Prepending to QT_BUILD_CMAKE_PREFIX_PATH helps find components of Qt6, because those # find_package calls use NO_DEFAULT_PATH, and thus CMAKE_PREFIX_PATH is ignored. + list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_BUILD_DIR}") list(PREPEND QT_BUILD_CMAKE_PREFIX_PATH "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/cmake") if(QT_BUILD_STANDALONE_TESTS) diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in index 3edd82f76d9..67fde7f05ff 100644 --- a/cmake/QtConfig.cmake.in +++ b/cmake/QtConfig.cmake.in @@ -134,9 +134,9 @@ foreach(module ${@INSTALL_CMAKE_NAMESPACE@_FIND_COMPONENTS}) ${@INSTALL_CMAKE_NAMESPACE@_FIND_VERSION} ${_@INSTALL_CMAKE_NAMESPACE@_FIND_PARTS_QUIET} PATHS + ${QT_BUILD_CMAKE_PREFIX_PATH} ${_qt_cmake_dir} ${_qt_additional_packages_prefix_paths} - ${QT_BUILD_CMAKE_PREFIX_PATH} ${__qt_find_package_host_qt_path} ${_qt_additional_host_packages_prefix_paths} ${__qt_use_no_default_path_for_qt_packages} diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in index 2e9b36fdb6f..d022783fd26 100644 --- a/cmake/QtModuleDependencies.cmake.in +++ b/cmake/QtModuleDependencies.cmake.in @@ -16,10 +16,10 @@ set(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED FALSE) if(NOT @INSTALL_CMAKE_NAMESPACE@_FOUND) find_dependency(@INSTALL_CMAKE_NAMESPACE@ @main_qt_package_version@ PATHS + ${QT_BUILD_CMAKE_PREFIX_PATH} "${CMAKE_CURRENT_LIST_DIR}/.." "${_qt_cmake_dir}" ${_qt_additional_packages_prefix_paths} - ${QT_BUILD_CMAKE_PREFIX_PATH} ${__qt_use_no_default_path_for_qt_packages} ) endif() diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake index e3f4126c73f..bd8b4a55c42 100644 --- a/cmake/QtPublicDependencyHelpers.cmake +++ b/cmake/QtPublicDependencyHelpers.cmake @@ -112,9 +112,9 @@ macro(_qt_internal_find_qt_dependencies target target_dep_list find_dependency_p NAMES ${__qt_${target}_pkg_names} PATHS + ${QT_BUILD_CMAKE_PREFIX_PATH} ${${find_dependency_path_list}} ${_qt_additional_packages_prefix_paths} - ${QT_BUILD_CMAKE_PREFIX_PATH} ${__qt_use_no_default_path_for_qt_packages} ) endif() |