diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-08-01 15:00:23 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 8b625f4d1f0fed1273b5b51f8216eebedbb5aa4e (patch) | |
| tree | c2f3f44d2d4bdf4de7c6588482838015c52d8194 | |
| parent | 821e58fdc1a21598e26dda542476ea530ac3c275 (diff) | |
| download | qtlocation-mapboxgl-8b625f4d1f0fed1273b5b51f8216eebedbb5aa4e.tar.gz | |
[build] exclude CMake 3.6.0 due to an automoc naming bug
| -rw-r--r-- | platform/qt/qt.cmake | 5 | ||||
| -rw-r--r-- | platform/qt/src/http_file_source.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index c2cebd7964..eb64e0f288 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -1,6 +1,11 @@ # This file is to be reused by target platforms that don't # support `mason` (i.e. Yocto). Do not add any `mason` macro. +if (CMAKE_VERSION VERSION_EQUAL "3.6.0") + # CMake 3.6.0 is buggy: https://gitlab.kitware.com/cmake/cmake/issues/16209 + message(FATAL_ERROR "CMake 3.6.0 is not supported due to a bug in automoc name generation. Please upgrade or downgrade.") +endif() + option(WITH_QT_DECODERS "Use builtin Qt image decoders" OFF) option(WITH_QT_4 "Use Qt4 instead of Qt5" OFF) diff --git a/platform/qt/src/http_file_source.cpp b/platform/qt/src/http_file_source.cpp index 89a5171692..87948609df 100644 --- a/platform/qt/src/http_file_source.cpp +++ b/platform/qt/src/http_file_source.cpp @@ -12,11 +12,7 @@ // Needs to be on the global namespace // for linking purposes. void initResources() { -#if defined(__APPLE__) - Q_INIT_RESOURCE(platform_qt_qmapbox); -#else Q_INIT_RESOURCE(qmapbox); -#endif } namespace mbgl { |