diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-14 09:06:58 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-14 15:03:13 +0200 |
| commit | b9c493728aa9f73b6876c6bef0ebd9f07824f553 (patch) | |
| tree | e0ffb8557d5650159b3d45b223acdf2a799c6371 /cmake/QtConfig.cmake.in | |
| parent | 721116de309f1933fad788fe4272c0d5c12b9909 (diff) | |
Revert "Revert "CMake: Fix usage of find_dependency()""
...and fix the build errors the original change caused.
This reverts commit 127fb8bb5587db52216d0ac934f3111170a7cbe3.
Change-Id: I4006b32734a51c5d101dd73c957f81d2a0f84ba1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtConfig.cmake.in')
| -rw-r--r-- | cmake/QtConfig.cmake.in | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in index 46a5d11ff7..95fc581993 100644 --- a/cmake/QtConfig.cmake.in +++ b/cmake/QtConfig.cmake.in @@ -51,15 +51,13 @@ endif() # Find required dependencies, if any. include(CMakeFindDependencyMacro) -set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND TRUE) if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@Dependencies.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@Dependencies.cmake") -endif() -if(NOT @INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND) - set(@INSTALL_CMAKE_NAMESPACE@_FOUND False) - message(FATAL_ERROR - "Failed to find Qt Platform dependency: - ${@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE}") + if(NOT @INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND) + set(@INSTALL_CMAKE_NAMESPACE@_FOUND FALSE) + message(FATAL_ERROR "Failed to find Qt Platform dependency: " + "${@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE}") + endif() endif() foreach(module ${@INSTALL_CMAKE_NAMESPACE@_FIND_COMPONENTS}) |