diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-07-29 09:47:21 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-07-29 09:47:21 -0500 |
| commit | 6136e88fcbce7c1fe63c4f5ead4e07f17cce0587 (patch) | |
| tree | 40bab26c7a26e6cba875659b5396c8a8f63784c5 | |
| parent | c77637d141a2847b504bb586c0ddcb87b9106557 (diff) | |
| parent | 085abb798a11fac3ae5376892b7b9ffcb365dfd2 (diff) | |
| download | monzero-gui-6136e88fcbce7c1fe63c4f5ead4e07f17cce0587.tar.gz monzero-gui-6136e88fcbce7c1fe63c4f5ead4e07f17cce0587.tar.xz monzero-gui-6136e88fcbce7c1fe63c4f5ead4e07f17cce0587.zip | |
Merge pull request #3013
085abb7 cmake: fix MacOS build (Qt installer) (xiphon)
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files 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) |