diff options
Diffstat (limited to 'cmake/QtModuleDependencies.cmake.in')
| -rw-r--r-- | cmake/QtModuleDependencies.cmake.in | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in index 24d132b57d..01cf9d5b3c 100644 --- a/cmake/QtModuleDependencies.cmake.in +++ b/cmake/QtModuleDependencies.cmake.in @@ -1,7 +1,16 @@ # Make sure @INSTALL_CMAKE_NAMESPACE@ is found before anything else. set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE) + +set(__qt_use_no_default_path_for_qt_packages "NO_DEFAULT_PATH") +if(QT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES) + set(__qt_use_no_default_path_for_qt_packages "") +endif() find_dependency(@INSTALL_CMAKE_NAMESPACE@ @PROJECT_VERSION@ - PATHS "${CMAKE_CURRENT_LIST_DIR}/.." ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH + PATHS + "${CMAKE_CURRENT_LIST_DIR}/.." + ${QT_ADDITIONAL_PACKAGES_PREFIX_PATH} + ${QT_EXAMPLES_CMAKE_PREFIX_PATH} + ${__qt_use_no_default_path_for_qt_packages} ) # note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;" @@ -75,7 +84,11 @@ foreach(_target_dep ${_target_deps}) if (NOT ${pkg}_FOUND) find_dependency(${pkg} ${version} - PATHS "${CMAKE_CURRENT_LIST_DIR}/.." ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH + PATHS + "${CMAKE_CURRENT_LIST_DIR}/.." + ${QT_ADDITIONAL_PACKAGES_PREFIX_PATH} + ${QT_EXAMPLES_CMAKE_PREFIX_PATH} + ${__qt_use_no_default_path_for_qt_packages} ) endif() endforeach() |