From 6562c22029a49afa2c2b2d30f100a876768cf79a Mon Sep 17 00:00:00 2001 From: Uli Heilmeier Date: Fri, 17 Apr 2020 09:15:06 +0200 Subject: [PATCH] Fix qt5_found handling --- client/CMakeLists.txt | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 47eea50da..229457852 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -12,22 +12,29 @@ endif() set(CMAKE_CXX_STANDARD 14) if(APPLE AND EXISTS /usr/local/opt/qt5) - # Homebrew installs Qt5 (up to at least 5.11.0) in - # /usr/local/qt5. Ensure that it can be found by CMake - # since it is not in the default /usr/local prefix. - # Add it to PATHS so that it doesn't override the - # CMAKE_PREFIX_PATH environment variable. - # QT_FIND_PACKAGE_OPTIONS should be passed to find_package, - # e.g. find_package(Qt5Core ${QT_FIND_PACKAGE_OPTIONS}) - list(APPEND QT_FIND_PACKAGE_OPTIONS PATHS /usr/local/opt/qt5) + # Homebrew installs Qt5 (up to at least 5.11.0) in + # /usr/local/qt5. Ensure that it can be found by CMake + # since it is not in the default /usr/local prefix. + # Add it to PATHS so that it doesn't override the + # CMAKE_PREFIX_PATH environment variable. + # QT_FIND_PACKAGE_OPTIONS should be passed to find_package, + # e.g. find_package(Qt5Core ${QT_FIND_PACKAGE_OPTIONS}) + list(APPEND QT_FIND_PACKAGE_OPTIONS PATHS /usr/local/opt/qt5) endif() set(QT_PACKAGELIST - Qt5Core - Qt5Widgets - Qt5Gui + Qt5Core + Qt5Widgets + Qt5Gui ) foreach(_qt_package IN LISTS QT_PACKAGELIST) - find_package(${_qt_package} REQUIRED ${QT_FIND_PACKAGE_OPTIONS}) + find_package(${_qt_package} REQUIRED ${QT_FIND_PACKAGE_OPTIONS}) +endforeach() + +set(Qt5_FOUND ON) +foreach(_qt_package IN LISTS QT_PACKAGELIST) + if(NOT ${_qt_package}_FOUND) + set(Qt5_FOUND OFF) + endif(NOT ${_qt_package}_FOUND) endforeach() SET (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")