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/QtPluginDependencies.cmake.in | |
| 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/QtPluginDependencies.cmake.in')
| -rw-r--r-- | cmake/QtPluginDependencies.cmake.in | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/cmake/QtPluginDependencies.cmake.in b/cmake/QtPluginDependencies.cmake.in index 9d16bedeba..bae6d85c7b 100644 --- a/cmake/QtPluginDependencies.cmake.in +++ b/cmake/QtPluginDependencies.cmake.in @@ -1,13 +1,12 @@ 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@") foreach(_target_dep ${_third_party_deps}) list(GET _target_dep 0 pkg) - list(GET _target_dep 1 is_optional) - list(GET _target_dep 2 version) - list(GET _target_dep 3 components) + list(GET _target_dep 1 version) + list(GET _target_dep 2 components) set(find_package_args "${pkg}") if(version) list(APPEND find_package_args "${version}") @@ -17,14 +16,7 @@ foreach(_target_dep ${_third_party_deps}) list(APPEND find_package_args COMPONENTS ${components}) 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}) - endif() + find_dependency(${find_package_args}) endforeach() # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0" |