CMake: use additional search paths also for tool package

Use paths configured with QT_ADDITIONAL_PACKAGES_PREFIX_PATH to search also for the tool packages. Task-number: QTBUG-93565 Pick-to: 6.1 Change-Id: I611b275dd7c4e7ecceb073d16643cd225bbb21d8 Reviewed-by: Alexandru Croitor <[email protected]>
testxsubject · May 10, 2021 · 60c87c6 · 60c87c6
1 parent 2a86ea1
commit 60c87c6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
@@ -63,7 +63,11 @@ foreach(_target_dep ${_tool_deps})
     if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
         list(APPEND find_package_args REQUIRED)
     endif()
-    find_package(${pkg} ${version} ${find_package_args})
+    find_package(${pkg} ${version} ${find_package_args}
+        PATHS
+            ${_qt_additional_packages_prefix_path}
+            ${_qt_additional_packages_prefix_path_env}
+    )
     if (NOT ${pkg}_FOUND)
         if(NOT "${QT_HOST_PATH}" STREQUAL "")
              set(CMAKE_PREFIX_PATH ${BACKUP_@target@_CMAKE_PREFIX_PATH})