From 92d0133c3b3900f6235466f6309cd58f5db32e64 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 20 Nov 2021 11:34:04 +0100 Subject: [PATCH] [cmake] Better handling of Qt5 packages Signed-off-by: Alexander Borsuk --- CMakeLists.txt | 19 +++++++------------ cmake/OmimHelpers.cmake | 8 -------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2de624ec3..438d25ff5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,21 +211,16 @@ if (NOT CMAKE_HOST_WIN32) endif() if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID) - find_package(Qt5Core) - if (NOT Qt5Core_FOUND) - message(FATAL_ERROR "Qt5 cmake files were not found, please set QT_PATH environment variable") - endif() - if (Qt5Core_VERSION VERSION_LESS 5.5.0) - message(FATAL_ERROR "Minimum supported Qt5 version is 5.5") - endif() - find_package(Qt5Network REQUIRED) + list(APPEND qt_components Core Network) if (NOT SKIP_DESKTOP OR NOT SKIP_TESTS OR PYBINDINGS) - find_package(Qt5Widgets) + list(APPEND qt_components Widgets) endif() if (NOT SKIP_DESKTOP) - find_qt5_desktop_package(Qt5Gui) - find_qt5_desktop_package(Qt5Xml) - find_qt5_desktop_package(Qt5Svg) + list(APPEND qt_components Gui Xml Svg) + endif() + find_package(Qt5 COMPONENTS REQUIRED ${qt_components}) + if (Qt5_VERSION VERSION_LESS 5.5.0) + message(FATAL_ERROR "Minimum supported Qt5 version is 5.5") endif() endif() diff --git a/cmake/OmimHelpers.cmake b/cmake/OmimHelpers.cmake index 811e3e9264..ecf7182abd 100644 --- a/cmake/OmimHelpers.cmake +++ b/cmake/OmimHelpers.cmake @@ -18,14 +18,6 @@ function(omim_set_platform_var PLATFORM_VAR pattern) endif() endfunction() -macro(find_qt5_desktop_package package) - find_package(${package}) - if (NOT ${package}_FOUND) - message(FATAL_ERROR "Can't find ${package}, consider to set SKIP_DESKTOP" - " if you don't need desktop app") - endif() -endmacro() - # Functions for using in subdirectories function(omim_add_executable executable) add_executable(${executable} ${ARGN})