diff options
Diffstat (limited to 'cmake/QtModuleConfig.cmake.in')
| -rw-r--r-- | cmake/QtModuleConfig.cmake.in | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in index 93185857162..de243aff2b3 100644 --- a/cmake/QtModuleConfig.cmake.in +++ b/cmake/QtModuleConfig.cmake.in @@ -32,26 +32,35 @@ if (NOT QT_NO_CREATE_TARGETS AND @INSTALL_CMAKE_NAMESPACE@@target@_FOUND) endif() # Find the private module counterpart. -if (@INSTALL_CMAKE_NAMESPACE@@target@_FOUND AND NOT @arg_NO_PRIVATE_MODULE@) - if(NOT @INSTALL_CMAKE_NAMESPACE@@target_private@_FOUND) - if("${_qt_cmake_dir}" STREQUAL "") - set(_qt_cmake_dir "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}") - endif() - 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_package(@INSTALL_CMAKE_NAMESPACE@@target_private@ "@PROJECT_VERSION@" EXACT - QUIET - CONFIG - PATHS - ${QT_BUILD_CMAKE_PREFIX_PATH} - "${CMAKE_CURRENT_LIST_DIR}/.." - "${_qt_cmake_dir}" - ${_qt_additional_packages_prefix_paths} - ${__qt_use_no_default_path_for_qt_packages} +set(__qt_@target@_always_load_private_module OFF) +include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@-build.cmake" OPTIONAL) +if (@INSTALL_CMAKE_NAMESPACE@@target@_FOUND + AND NOT @INSTALL_CMAKE_NAMESPACE@@target_private@_FOUND + AND NOT @arg_NO_PRIVATE_MODULE@ + AND ( + __qt_@target@_always_load_private_module + OR DEFINED QT_REPO_MODULE_VERSION + OR QT_FIND_PRIVATE_MODULES ) + ) + if("${_qt_cmake_dir}" STREQUAL "") + set(_qt_cmake_dir "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}") endif() + 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_package(@INSTALL_CMAKE_NAMESPACE@@target_private@ "@PROJECT_VERSION@" EXACT + QUIET + CONFIG + PATHS + ${QT_BUILD_CMAKE_PREFIX_PATH} + "${CMAKE_CURRENT_LIST_DIR}/.." + "${_qt_cmake_dir}" + ${_qt_additional_packages_prefix_paths} + ${__qt_use_no_default_path_for_qt_packages} + ) + if(NOT @INSTALL_CMAKE_NAMESPACE@@target_private@_FOUND) get_property(@INSTALL_CMAKE_NAMESPACE@@target_private@_warning_shown GLOBAL PROPERTY @INSTALL_CMAKE_NAMESPACE@@target_private@_warning_shown @@ -68,6 +77,7 @@ if (@INSTALL_CMAKE_NAMESPACE@@target@_FOUND AND NOT @arg_NO_PRIVATE_MODULE@) endif() endif() endif() +unset(__qt_@target@_always_load_private_module) if (NOT QT_NO_CREATE_TARGETS AND @INSTALL_CMAKE_NAMESPACE@@target@_FOUND) # DEPRECATED |