diff options
| author | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
|---|---|---|
| committer | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
| commit | 9e8dc9a9e3e86adb9987ae69766cc42c7d9efece (patch) | |
| tree | f5f0abd4d342c89ad0405d01969f9d6caecc1c90 /platform/qt/config.cmake | |
| parent | 16fb0672e64a72b7400c321d55858b73cd5d8c3f (diff) | |
| parent | f28d75dccd9bf4a7615df87faccc5cf5eff8df89 (diff) | |
| download | qtlocation-mapboxgl-9e8dc9a9e3e86adb9987ae69766cc42c7d9efece.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/custom-vector-source
Diffstat (limited to 'platform/qt/config.cmake')
| -rw-r--r-- | platform/qt/config.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index e1c454c757..e97c6b340a 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -1,7 +1,7 @@ include(platform/qt/qt.cmake) mason_use(sqlite VERSION 3.14.2) -mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX}) +mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX}) if(NOT WITH_QT_DECODERS) mason_use(libjpeg-turbo VERSION 1.5.0) @@ -23,8 +23,6 @@ macro(mbgl_platform_core) PRIVATE platform/qt/include ) - target_add_mason_package(mbgl-core PRIVATE sqlite) - target_link_libraries(mbgl-core ${MBGL_QT_LIBRARIES} ) |