[build] Workaround automoc issue on some cmake versions

This commit is contained in:
Thiago Marcos P. Santos
2016-08-01 17:26:49 +03:00
committed by Konstantin Käfer
parent 95b6d48b71
commit 75ca6d9bdd
3 changed files with 4 additions and 8 deletions

View File

@@ -1,11 +1,6 @@
# 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)
@@ -55,9 +50,6 @@ set(MBGL_QT_FILES
PRIVATE platform/qt/src/timer.cpp
PRIVATE platform/qt/src/timer_impl.hpp
# Qt resources
PRIVATE platform/qt/qmapbox.qrc
# Public headers
PRIVATE platform/qt/include/qmapbox.hpp
PRIVATE platform/qt/include/qmapboxgl.hpp

View File

@@ -1,5 +1,7 @@
find_package(Qt4 REQUIRED)
QT4_ADD_RESOURCES(MBGL_QT_FILES platform/qt/qmapbox.qrc)
set(MBGL_QT_LIBRARIES
PRIVATE Qt4::QtCore
PRIVATE Qt4::QtGui

View File

@@ -6,6 +6,8 @@ find_package(Qt5OpenGL REQUIRED)
find_package(Qt5Quick REQUIRED)
find_package(Qt5Widgets REQUIRED)
QT5_ADD_RESOURCES(MBGL_QT_FILES platform/qt/qmapbox.qrc)
set(MBGL_QT_LIBRARIES
PRIVATE Qt5::Core
PRIVATE Qt5::Gui