1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Use namespaced variables in Qt6*Dependencies.cmake

Browse Source 
Change-Id: I166988020cfd9750a4d58e519742215d0c03ad3e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bd594f945773f713ca493fd7b040fde8a12bdf87)
This commit is contained in:
Li Xinwei 2021-07-23 15:37:14 +08:00
parent bb6c9b368c
commit c230fa69d3
4 changed files with 95 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
cmake/QtConfigDependencies.cmake.in
View File

@ -1,50 +1,49 @@
set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND FALSE) set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND FALSE)
# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;" # note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;"
set(_third_party_deps "@third_party_deps@") set(__qt_third_party_deps "@third_party_deps@")
@third_party_extra@ @third_party_extra@
foreach(_target_dep ${_third_party_deps}) foreach(__qt_target_dep ${__qt_third_party_deps})
list(GET _target_dep 0 pkg) list(GET __qt_target_dep 0 __qt_pkg)
list(GET _target_dep 1 is_optional) list(GET __qt_target_dep 1 __qt_is_optional)
list(GET _target_dep 2 version) list(GET __qt_target_dep 2 __qt_version)
list(GET _target_dep 3 components) list(GET __qt_target_dep 3 __qt_components)
list(GET _target_dep 4 optional_components) list(GET __qt_target_dep 4 __qt_optional_components)
set(find_package_args "${pkg}") set(__qt_find_package_args "${__qt_pkg}")
if(version) if(__qt_version)
list(APPEND find_package_args "${version}") list(APPEND __qt_find_package_args "${__qt_version}")
endif() endif()
if(components) if(__qt_components)
string(REPLACE " " ";" components "${components}") string(REPLACE " " ";" __qt_components "${__qt_components}")
list(APPEND find_package_args COMPONENTS ${components}) list(APPEND __qt_find_package_args COMPONENTS ${__qt_components})
endif() endif()
if(optional_components) if(__qt_optional_components)
string(REPLACE " " ";" optional_components "${optional_components}") string(REPLACE " " ";" __qt_optional_components "${__qt_optional_components}")
list(APPEND find_package_args OPTIONAL_COMPONENTS ${optional_components}) list(APPEND __qt_find_package_args OPTIONAL_COMPONENTS ${__qt_optional_components})
endif() endif()
# Already build an error message, because find_dependency calls return() on failure. # Already build an error message, because find_dependency calls return() on failure.
set(__@INSTALL_CMAKE_NAMESPACE@_message "\nPackage: ${pkg}") set(__qt_message "\nPackage: ${__qt_pkg}")
if(version) if(__qt_version)
string(APPEND __@INSTALL_CMAKE_NAMESPACE@_message "\nVersion: ${version}") string(APPEND __qt_message "\nVersion: ${__qt_version}")
endif() endif()
if(components) if(__qt_components)
string(APPEND __@INSTALL_CMAKE_NAMESPACE@_message "\nComponents: ${components}") string(APPEND __qt_message "\nComponents: ${__qt_components}")
endif() endif()
if(optional_components) if(__qt_optional_components)
string(APPEND __@INSTALL_CMAKE_NAMESPACE@_message "\nComponents: ${optional_components}") string(APPEND __qt_message "\nComponents: ${__qt_optional_components}")
endif() endif()
set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE "${__qt_message}")
"${__@INSTALL_CMAKE_NAMESPACE@_message}")
if(is_optional) if(__qt_is_optional)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND find_package_args QUIET) list(APPEND __qt_find_package_args QUIET)
endif() endif()
find_package(${find_package_args}) find_package(${__qt_find_package_args})
else() else()
find_dependency(${find_package_args}) find_dependency(${__qt_find_package_args})
endif() endif()
endforeach() endforeach()

70
cmake/QtModuleDependencies.cmake.in
View File

@ -15,39 +15,39 @@ find_dependency(@INSTALL_CMAKE_NAMESPACE@ @PROJECT_VERSION@
) )
# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;" # note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;"
set(_third_party_deps "@third_party_deps@") set(__qt_@target@_third_party_deps "@third_party_deps@")
foreach(_target_dep ${_third_party_deps}) foreach(__qt_@target@_target_dep ${__qt_@target@_third_party_deps})
list(GET _target_dep 0 pkg) list(GET __qt_@target@_target_dep 0 __qt_@target@_pkg)
list(GET _target_dep 1 is_optional) list(GET __qt_@target@_target_dep 1 __qt_@target@_is_optional)
list(GET _target_dep 2 version) list(GET __qt_@target@_target_dep 2 __qt_@target@_version)
list(GET _target_dep 3 components) list(GET __qt_@target@_target_dep 3 __qt_@target@_components)
list(GET _target_dep 4 optional_components) list(GET __qt_@target@_target_dep 4 __qt_@target@_optional_components)
set(find_package_args "${pkg}") set(__qt_@target@_find_package_args "${__qt_@target@_pkg}")
if(version) if(__qt_@target@_version)
list(APPEND find_package_args "${version}") list(APPEND __qt_@target@_find_package_args "${__qt_@target@_version}")
endif() endif()
if(components) if(__qt_@target@_components)
string(REPLACE " " ";" components "${components}") string(REPLACE " " ";" __qt_@target@_components "${__qt_@target@_components}")
list(APPEND find_package_args COMPONENTS ${components}) list(APPEND __qt_@target@_find_package_args COMPONENTS ${__qt_@target@_components})
endif() endif()
if(optional_components) if(__qt_@target@_optional_components)
string(REPLACE " " ";" optional_components "${optional_components}") string(REPLACE " " ";" __qt_@target@_optional_components "${__qt_@target@_optional_components}")
list(APPEND find_package_args OPTIONAL_COMPONENTS ${optional_components}) list(APPEND __qt_@target@_find_package_args OPTIONAL_COMPONENTS ${__qt_@target@_optional_components})
endif() endif()
if(is_optional) if(__qt_@target@_is_optional)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND find_package_args QUIET) list(APPEND __qt_@target@_find_package_args QUIET)
endif() endif()
find_package(${find_package_args}) find_package(${__qt_@target@_find_package_args})
else() else()
find_dependency(${find_package_args}) find_dependency(${__qt_@target@_find_package_args})
endif() endif()
endforeach() endforeach()
# Find Qt tool package. # Find Qt tool package.
set(_tool_deps "@main_module_tool_deps@") set(__qt_@target@_tool_deps "@main_module_tool_deps@")
if(NOT "${QT_HOST_PATH}" STREQUAL "") if(NOT "${QT_HOST_PATH}" STREQUAL "")
# Make sure that the tools find the host tools first # Make sure that the tools find the host tools first
@ -57,23 +57,23 @@ if(NOT "${QT_HOST_PATH}" STREQUAL "")
list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}") list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}")
endif() endif()
foreach(_target_dep ${_tool_deps}) foreach(__qt_@target@_target_dep ${__qt_@target@_tool_deps})
list(GET _target_dep 0 pkg) list(GET __qt_@target@_target_dep 0 __qt_@target@_pkg)
list(GET _target_dep 1 version) list(GET __qt_@target@_target_dep 1 __qt_@target@_version)
unset(find_package_args) unset(__qt_@target@_find_package_args)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND find_package_args QUIET) list(APPEND __qt_@target@_find_package_args QUIET)
endif() endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
list(APPEND find_package_args REQUIRED) list(APPEND __qt_@target@_find_package_args REQUIRED)
endif() endif()
find_package(${pkg} ${version} ${find_package_args} find_package(${__qt_@target@_pkg} ${__qt_@target@_version} ${__qt_@target@_find_package_args}
PATHS PATHS
${_qt_additional_packages_prefix_path} ${_qt_additional_packages_prefix_path}
${_qt_additional_packages_prefix_path_env} ${_qt_additional_packages_prefix_path_env}
) )
if (NOT ${pkg}_FOUND) if (NOT ${__qt_@target@_pkg}_FOUND)
if(NOT "${QT_HOST_PATH}" STREQUAL "") if(NOT "${QT_HOST_PATH}" STREQUAL "")
set(CMAKE_PREFIX_PATH ${BACKUP_@target@_CMAKE_PREFIX_PATH}) set(CMAKE_PREFIX_PATH ${BACKUP_@target@_CMAKE_PREFIX_PATH})
set(CMAKE_FIND_ROOT_PATH ${BACKUP_@target@_CMAKE_FIND_ROOT_PATH}) set(CMAKE_FIND_ROOT_PATH ${BACKUP_@target@_CMAKE_FIND_ROOT_PATH})
@ -87,13 +87,13 @@ if(NOT "${QT_HOST_PATH}" STREQUAL "")
endif() endif()
# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0" # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
set(_target_deps "@target_deps@") set(__qt_@target@_target_deps "@target_deps@")
foreach(_target_dep ${_target_deps}) foreach(__qt_@target@_target_dep ${__qt_@target@_target_deps})
list(GET _target_dep 0 pkg) list(GET __qt_@target@_target_dep 0 __qt_@target@_pkg)
list(GET _target_dep 1 version) list(GET __qt_@target@_target_dep 1 __qt_@target@_version)
if (NOT ${pkg}_FOUND) if (NOT ${__qt_@target@_pkg}_FOUND)
find_dependency(${pkg} ${version} find_dependency(${__qt_@target@_pkg} ${__qt_@target@_version}
PATHS PATHS
"${CMAKE_CURRENT_LIST_DIR}/.." "${CMAKE_CURRENT_LIST_DIR}/.."
${_qt_additional_packages_prefix_path} ${_qt_additional_packages_prefix_path}

12
cmake/QtModuleToolsDependencies.cmake.in
View File

@ -1,12 +1,12 @@
# Find "ModuleTools" dependencies, which are other ModuleTools packages. # Find "ModuleTools" dependencies, which are other ModuleTools packages.
set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE) set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE)
set(_tool_deps "@package_deps@") set(__qt_@target@_tool_deps "@package_deps@")
foreach(_target_dep ${_tool_deps}) foreach(__qt_@target@_target_dep ${__qt_@target@_tool_deps})
list(GET _target_dep 0 pkg) list(GET __qt_@target@_target_dep 0 __qt_@target@_pkg)
list(GET _target_dep 1 version) list(GET __qt_@target@_target_dep 1 __qt_@target@_version)
if (NOT ${pkg}_FOUND) if (NOT ${__qt_@target@_pkg}_FOUND)
find_dependency(${pkg} ${version}) find_dependency(${__qt_@target@_pkg} ${__qt_@target@_version})
endif() endif()
endforeach() endforeach()

52
cmake/QtPluginDependencies.cmake.in
View File

@ -1,34 +1,34 @@
set(@target@_FOUND FALSE) set(@target@_FOUND FALSE)
# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;" # note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;"
set(_third_party_deps "@third_party_deps@") set(__qt_@target@_third_party_deps "@third_party_deps@")
foreach(_target_dep ${_third_party_deps}) foreach(__qt_@target@_target_dep ${__qt_@target@_third_party_deps})
list(GET _target_dep 0 pkg) list(GET __qt_@target@_target_dep 0 __qt_@target@_pkg)
list(GET _target_dep 1 is_optional) list(GET __qt_@target@_target_dep 1 __qt_@target@_is_optional)
list(GET _target_dep 2 version) list(GET __qt_@target@_target_dep 2 __qt_@target@_version)
list(GET _target_dep 3 components) list(GET __qt_@target@_target_dep 3 __qt_@target@_components)
list(GET _target_dep 4 optional_components) list(GET __qt_@target@_target_dep 4 __qt_@target@_optional_components)
set(find_package_args "${pkg}") set(__qt_@target@_find_package_args "${__qt_@target@_pkg}")
if(version) if(__qt_@target@_version)
list(APPEND find_package_args "${version}") list(APPEND __qt_@target@_find_package_args "${__qt_@target@_version}")
endif() endif()
if(components) if(__qt_@target@_components)
string(REPLACE " " ";" components "${components}") string(REPLACE " " ";" __qt_@target@_components "${__qt_@target@_components}")
list(APPEND find_package_args COMPONENTS ${components}) list(APPEND __qt_@target@_find_package_args COMPONENTS ${__qt_@target@_components})
endif() endif()
if(optional_components) if(__qt_@target@_optional_components)
string(REPLACE " " ";" optional_components "${optional_components}") string(REPLACE " " ";" __qt_@target@_optional_components "${__qt_@target@_optional_components}")
list(APPEND find_package_args OPTIONAL_COMPONENTS ${optional_components}) list(APPEND __qt_@target@_find_package_args OPTIONAL_COMPONENTS ${__qt_@target@_optional_components})
endif() endif()
if(is_optional) if(__qt_@target@_is_optional)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND find_package_args QUIET) list(APPEND __qt_@target@_find_package_args QUIET)
endif() endif()
find_package(${find_package_args}) find_package(${__qt_@target@_find_package_args})
else() else()
find_dependency(${find_package_args}) find_dependency(${__qt_@target@_find_package_args})
endif() endif()
endforeach() endforeach()
@ -38,13 +38,13 @@ if(QT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES)
endif() endif()
# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0" # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
set(_target_deps "@target_deps@") set(__qt_@target@_target_deps "@target_deps@")
foreach(_target_dep ${_target_deps}) foreach(__qt_@target@_target_dep ${__qt_@target@_target_deps})
list(GET _target_dep 0 pkg) list(GET __qt_@target@_target_dep 0 __qt_@target@_pkg)
list(GET _target_dep 1 version) list(GET __qt_@target@_target_dep 1 __qt_@target@_version)
if (NOT ${pkg}_FOUND) if (NOT ${__qt_@target@_pkg}_FOUND)
find_dependency(${pkg} ${version} find_dependency(${__qt_@target@_pkg} ${__qt_@target@_version}
PATHS PATHS
@find_dependency_paths@ @find_dependency_paths@
${_qt_additional_packages_prefix_path} ${_qt_additional_packages_prefix_path}