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

Revert "CMake: Add facility to mark package dependencies as optional"

Browse Source 
This reverts commit 3685483c4b79b4075bab6d341174a395359d1b4a.

This lead to configuration errors on some machines, blocking
development.

Change-Id: I309cdd55a8ef64899afcbeca54458d1c6d686951
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Lars Knoll 2020-09-13 12:16:08 +02:00
parent f0873a1c62
commit b0c51f86f4
5 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/QtConfigDependencies.cmake.in
View File

@ -1,13 +1,12 @@
# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;" # note: _third_party_deps example: "ICU\\;1.0\\;i18n uc data;ZLIB\\;\\;"
set(_third_party_deps "@third_party_deps@") set(_third_party_deps "@third_party_deps@")
@third_party_extra@ @third_party_extra@
foreach(_target_dep ${_third_party_deps}) foreach(_target_dep ${_third_party_deps})
list(GET _target_dep 0 pkg) list(GET _target_dep 0 pkg)
list(GET _target_dep 1 is_optional) list(GET _target_dep 1 version)
list(GET _target_dep 2 version) list(GET _target_dep 2 components)
list(GET _target_dep 3 components)
set(find_package_args "${pkg}") set(find_package_args "${pkg}")
if(version) if(version)
list(APPEND find_package_args "${version}") list(APPEND find_package_args "${version}")
@ -28,14 +27,7 @@ foreach(_target_dep ${_third_party_deps})
set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE
"${__@INSTALL_CMAKE_NAMESPACE@_message}") "${__@INSTALL_CMAKE_NAMESPACE@_message}")
if(is_optional)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND find_package_args QUIET)
endif()
find_package(${find_package_args})
else()
find_dependency(${find_package_args}) find_dependency(${find_package_args})
endif()
endforeach() endforeach()
set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND TRUE) set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND TRUE)

10
cmake/QtFindPackageHelpers.cmake
View File

@ -15,8 +15,7 @@ endfunction()
macro(qt_find_package) macro(qt_find_package)
# Get the target names we expect to be provided by the package. # Get the target names we expect to be provided by the package.
set(find_package_options CONFIG NO_MODULE MODULE REQUIRED) set(options CONFIG NO_MODULE MODULE REQUIRED)
set(options ${find_package_options} MARK_OPTIONAL)
set(oneValueArgs MODULE_NAME QMAKE_LIB) set(oneValueArgs MODULE_NAME QMAKE_LIB)
set(multiValueArgs PROVIDED_TARGETS COMPONENTS) set(multiValueArgs PROVIDED_TARGETS COMPONENTS)
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@ -91,7 +90,7 @@ macro(qt_find_package)
endif() endif()
# Ensure the options are back in the original unparsed arguments # Ensure the options are back in the original unparsed arguments
foreach(opt IN LISTS find_package_options) foreach(opt IN LISTS options)
if(arg_${opt}) if(arg_${opt})
list(APPEND arg_UNPARSED_ARGUMENTS ${opt}) list(APPEND arg_UNPARSED_ARGUMENTS ${opt})
endif() endif()
@ -130,9 +129,8 @@ macro(qt_find_package)
set(qt_find_package_target_name ${aliased_target}) set(qt_find_package_target_name ${aliased_target})
endif() endif()
set_target_properties(${qt_find_package_target_name} PROPERTIES set_target_properties(${qt_find_package_target_name}
INTERFACE_QT_PACKAGE_NAME ${ARGV0} PROPERTIES INTERFACE_QT_PACKAGE_NAME ${ARGV0})
INTERFACE_QT_PACKAGE_IS_OPTIONAL ${arg_MARK_OPTIONAL})
if(package_version) if(package_version)
set_target_properties(${qt_find_package_target_name} set_target_properties(${qt_find_package_target_name}
PROPERTIES INTERFACE_QT_PACKAGE_VERSION ${ARGV1}) PROPERTIES INTERFACE_QT_PACKAGE_VERSION ${ARGV1})

14
cmake/QtModuleDependencies.cmake.in
View File

@ -4,14 +4,13 @@ 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_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH
) )
# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;" # note: _third_party_deps example: "ICU\\;1.0\\;i18n uc data;ZLIB\\;\\;"
set(_third_party_deps "@third_party_deps@") set(_third_party_deps "@third_party_deps@")
foreach(_target_dep ${_third_party_deps}) foreach(_target_dep ${_third_party_deps})
list(GET _target_dep 0 pkg) list(GET _target_dep 0 pkg)
list(GET _target_dep 1 is_optional) list(GET _target_dep 1 version)
list(GET _target_dep 2 version) list(GET _target_dep 2 components)
list(GET _target_dep 3 components)
set(find_package_args "${pkg}") set(find_package_args "${pkg}")
if(version) if(version)
list(APPEND find_package_args "${version}") list(APPEND find_package_args "${version}")
@ -21,14 +20,7 @@ foreach(_target_dep ${_third_party_deps})
list(APPEND find_package_args COMPONENTS ${components}) list(APPEND find_package_args COMPONENTS ${components})
endif() endif()
if(is_optional)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND find_package_args QUIET)
endif()
find_package(${find_package_args})
else()
find_dependency(${find_package_args}) find_dependency(${find_package_args})
endif()
endforeach() endforeach()
# Find Qt tool package. # Find Qt tool package.

14
cmake/QtPluginDependencies.cmake.in
View File

@ -1,13 +1,12 @@
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\\;1.0\\;i18n uc data;ZLIB\\;\\;"
set(_third_party_deps "@third_party_deps@") set(_third_party_deps "@third_party_deps@")
foreach(_target_dep ${_third_party_deps}) foreach(_target_dep ${_third_party_deps})
list(GET _target_dep 0 pkg) list(GET _target_dep 0 pkg)
list(GET _target_dep 1 is_optional) list(GET _target_dep 1 version)
list(GET _target_dep 2 version) list(GET _target_dep 2 components)
list(GET _target_dep 3 components)
set(find_package_args "${pkg}") set(find_package_args "${pkg}")
if(version) if(version)
list(APPEND find_package_args "${version}") list(APPEND find_package_args "${version}")
@ -17,14 +16,7 @@ foreach(_target_dep ${_third_party_deps})
list(APPEND find_package_args COMPONENTS ${components}) list(APPEND find_package_args COMPONENTS ${components})
endif() endif()
if(is_optional)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND find_package_args QUIET)
endif()
find_package(${find_package_args})
else()
find_dependency(${find_package_args}) find_dependency(${find_package_args})
endif()
endforeach() endforeach()
# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0" # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"

3
cmake/QtPostProcessHelpers.cmake
View File

@ -43,7 +43,6 @@ macro(qt_collect_third_party_deps target)
get_target_property(package_name ${dep} INTERFACE_QT_PACKAGE_NAME) get_target_property(package_name ${dep} INTERFACE_QT_PACKAGE_NAME)
if(dep_seen EQUAL -1 AND package_name) if(dep_seen EQUAL -1 AND package_name)
list(APPEND third_party_deps_seen ${dep}) list(APPEND third_party_deps_seen ${dep})
get_target_property(package_is_optional ${dep} INTERFACE_QT_PACKAGE_IS_OPTIONAL)
get_target_property(package_version ${dep} INTERFACE_QT_PACKAGE_VERSION) get_target_property(package_version ${dep} INTERFACE_QT_PACKAGE_VERSION)
if(NOT package_version) if(NOT package_version)
set(package_version "") set(package_version "")
@ -55,7 +54,7 @@ macro(qt_collect_third_party_deps target)
endif() endif()
list(APPEND third_party_deps list(APPEND third_party_deps
"${package_name}\;${package_is_optional}\;${package_version}\;${package_components}") "${package_name}\;${package_version}\;${package_components}")
endif() endif()
endif() endif()
endforeach() endforeach()