From 085abb798a11fac3ae5376892b7b9ffcb365dfd2 Mon Sep 17 00:00:00 2001 From: xiphon Date: Tue, 14 Jul 2020 23:36:30 +0000 Subject: [PATCH] cmake: fix MacOS build (Qt installer) --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71efa7ca..08e110c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,9 +241,11 @@ if(APPLE) endif() endif() +find_package(PkgConfig REQUIRED) + # TODO: drop this once we switch to Qt 5.14+ -find_package(Qt5QmlModels QUIET) -if(Qt5QmlModels_FOUND) +pkg_check_modules(Qt5QmlModels_PKG_CONFIG QUIET Qt5QmlModels) +if(Qt5QmlModels_PKG_CONFIG_FOUND) list(APPEND QT5_LIBRARIES Qt5QmlModels) endif() @@ -255,9 +257,9 @@ endif() foreach(QT5_MODULE ${QT5_LIBRARIES}) find_package(${QT5_MODULE} REQUIRED) + include_directories(${${QT5_MODULE}_INCLUDE_DIRS}) endforeach() -find_package(PkgConfig REQUIRED) pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES}) if(QT5_PKG_CONFIG_FOUND)