diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-13 12:16:08 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-13 12:20:56 +0200 |
| commit | b0c51f86f40b6b6d18fe2bb75cc851d36395240d (patch) | |
| tree | 1e8a71101c55bd21937ed58c19ad4441e30c9116 /cmake/QtFindPackageHelpers.cmake | |
| parent | f0873a1c62cb880b2586ebda0f40e69c930c1cec (diff) | |
Revert "CMake: Add facility to mark package dependencies as optional"
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>
Diffstat (limited to 'cmake/QtFindPackageHelpers.cmake')
| -rw-r--r-- | cmake/QtFindPackageHelpers.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmake/QtFindPackageHelpers.cmake b/cmake/QtFindPackageHelpers.cmake index c68ba4d14a..0ca585d1d4 100644 --- a/cmake/QtFindPackageHelpers.cmake +++ b/cmake/QtFindPackageHelpers.cmake @@ -15,8 +15,7 @@ endfunction() macro(qt_find_package) # Get the target names we expect to be provided by the package. - set(find_package_options CONFIG NO_MODULE MODULE REQUIRED) - set(options ${find_package_options} MARK_OPTIONAL) + set(options CONFIG NO_MODULE MODULE REQUIRED) set(oneValueArgs MODULE_NAME QMAKE_LIB) set(multiValueArgs PROVIDED_TARGETS COMPONENTS) cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -91,7 +90,7 @@ macro(qt_find_package) endif() # 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}) list(APPEND arg_UNPARSED_ARGUMENTS ${opt}) endif() @@ -130,9 +129,8 @@ macro(qt_find_package) set(qt_find_package_target_name ${aliased_target}) endif() - set_target_properties(${qt_find_package_target_name} PROPERTIES - INTERFACE_QT_PACKAGE_NAME ${ARGV0} - INTERFACE_QT_PACKAGE_IS_OPTIONAL ${arg_MARK_OPTIONAL}) + set_target_properties(${qt_find_package_target_name} + PROPERTIES INTERFACE_QT_PACKAGE_NAME ${ARGV0}) if(package_version) set_target_properties(${qt_find_package_target_name} PROPERTIES INTERFACE_QT_PACKAGE_VERSION ${ARGV1}) |