diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-07-28 13:01:43 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 95b6d48b710a38b7969b72b6d2a89f3930fdbc0f (patch) | |
| tree | 6e9b3ebd71c0c9b12ba4f2cd28fadf17daa182ae /platform/qt | |
| parent | 6ccdd7d4817ea550db0578fa63da5d0f9335297b (diff) | |
| download | qtlocation-mapboxgl-95b6d48b710a38b7969b72b6d2a89f3930fdbc0f.tar.gz | |
[build] use cmake script bundled with Mason
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/config.cmake | 9 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 5e3b0bd92a..46cc98eb81 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -1,11 +1,12 @@ include(platform/qt/qt.cmake) -mason_use(sqlite 3.9.1) +mason_use(sqlite VERSION 3.9.1) +mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX}) if(NOT WITH_QT_DECODERS) - mason_use(libjpeg-turbo 1.4.2) - mason_use(libpng 1.6.20) - mason_use(webp 0.5.0) + mason_use(libjpeg-turbo VERSION 1.4.2) + mason_use(libpng VERSION 1.6.20) + mason_use(webp VERSION 0.5.0) endif() macro(mbgl_platform_core) diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 9d8ae10f9e..2d3ec58ad9 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -82,7 +82,7 @@ else() endif() # OS specific configurations -if (BUILD_PLATFORM STREQUAL "macos") +if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") list(APPEND MBGL_QT_FILES PRIVATE platform/darwin/src/nsthread.mm PRIVATE platform/darwin/src/headless_view_cgl.cpp |