From dd38ad600ff85f40dd33499f24c5b88541e2acf2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 10 May 2012 17:55:13 +0200 Subject: Only find dependencies from the same Qt installation. Add a PATH to search for dependencies in the current prefix, and disable other CMake searching logic with NO_DEFAULT_PATH. A Qt installation must all be installed to the same prefix currently. If that constraint is ever relaxed, we can turn this into a hint instead. Change-Id: I633cafb7e546dbd102ac0b2ed18db260d26adc51 Reviewed-by: Alexander Neundorf Reviewed-by: Stephen Kelly --- mkspecs/cmake/Qt5BasicConfig.cmake.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/cmake/Qt5BasicConfig.cmake.in index f3c7206318..60024e5af9 100644 --- a/mkspecs/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/cmake/Qt5BasicConfig.cmake.in @@ -31,7 +31,11 @@ endif() foreach(_module_dep ${_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES}) if (NOT Qt5${_module_dep}_FOUND) - find_package(Qt5${_module_dep} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}) + find_package(Qt5${_module_dep} + ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} + ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} + PATHS "${_qt5$${CMAKE_MODULE_NAME}_install_prefix}" NO_DEFAULT_PATH + ) endif() if (NOT Qt5${_module_dep}_FOUND) -- cgit v1.2.3