tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[windows][qt] Add build defines to build Mapbox GL + Qt on Windows

Browse Source
This commit is contained in:
Thiago Marcos P. Santos
2017-12-19 15:36:17 +01:00
parent f391271532
commit 5786286f9c
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/qt/config.cmake
View File

@@ -1,3 +1,6 @@
mason_use(optional VERSION f27e7908 HEADER_ONLY)
mason_use(tao_tuple VERSION 28626e99 HEADER_ONLY)
include(platform/qt/qt.cmake)
if(NOT WITH_QT_DECODERS)
@@ -48,6 +51,10 @@ macro(mbgl_platform_core)
target_sources(mbgl-core PRIVATE platform/default/local_glyph_rasterizer.cpp)
if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
target_add_mason_package(mbgl-core PRIVATE optional)
target_add_mason_package(mbgl-core PRIVATE tao_tuple)
endif()
endmacro()
@@ -59,6 +66,11 @@ macro(mbgl_filesource)
target_link_libraries(mbgl-filesource
${MBGL_QT_FILESOURCE_LIBRARIES}
)
if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
target_add_mason_package(mbgl-filesource PRIVATE optional)
target_add_mason_package(mbgl-filesource PRIVATE tao_tuple)
endif()
endmacro()
# FIXME: For now tests are disabled on Windows until we

17
platform/qt/qt.cmake
View File

@@ -124,9 +124,26 @@ elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
)
endif()
elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
add_definitions("-DQT_COMPILING_QIMAGE_COMPAT_CPP")
add_definitions("-DRAPIDJSON_HAS_CXX11_RVALUE_REFS")
add_definitions("-D_USE_MATH_DEFINES")
add_definitions("-D_WINDOWS")
add_definitions("-Wno-deprecated-declarations")
add_definitions("-Wno-macro-redefined")
add_definitions("-Wno-microsoft-exception-spec")
add_definitions("-Wno-unknown-argument")
add_definitions("-Wno-unknown-warning-option")
add_definitions("-Wno-unused-command-line-argument")
add_definitions("-Wno-unused-local-typedef")
add_definitions("-Wno-unused-private-field")
list(APPEND MBGL_QT_CORE_FILES
PRIVATE platform/qt/src/thread.cpp
)
target_add_mason_package(qmapboxgl PRIVATE optional)
target_add_mason_package(qmapboxgl PRIVATE tao_tuple)
endif()
add_custom_command(