summaryrefslogtreecommitdiff
path: root/platform/qt
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2018-10-24 01:53:22 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2018-10-31 18:19:28 +0200
commit69960afb8db0444ec11cb46b47e877cc34f61fc7 (patch)
tree37bcc19f033aadd8c3c158fad02b8c5e4a9437ed /platform/qt
parent3a3c05bd8aeabf179084bd9a0137edd2abf41e4c (diff)
downloadqtlocation-mapboxgl-69960afb8db0444ec11cb46b47e877cc34f61fc7.tar.gz
[build] Add build system for submodules
Vendorize the submodules and a simple CMake build system for all them. The dependencies will inherit compilation options for core. The goal is to make Mapbox GL Core completely self contained with a simple offline build.
Diffstat (limited to 'platform/qt')
-rw-r--r--platform/qt/config.cmake20
-rw-r--r--platform/qt/qt.cmake2
2 files changed, 2 insertions, 20 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index 9f7ee24cfb..a2c6b0a9e9 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -1,9 +1,4 @@
include(platform/qt/qt.cmake)
-include(cmake/nunicode.cmake)
-
-if(NOT WITH_QT_I18N)
- include(cmake/icu.cmake)
-endif()
macro(mbgl_platform_core)
target_sources(mbgl-core
@@ -16,9 +11,9 @@ macro(mbgl_platform_core)
PRIVATE platform/qt/include
)
- target_link_libraries(mbgl-core
+ target_link_libraries(mbgl-core PRIVATE
${MBGL_QT_CORE_LIBRARIES}
- PRIVATE nunicode
+ nunicode
)
if(NOT WITH_QT_DECODERS)
@@ -39,10 +34,6 @@ macro(mbgl_platform_core)
else()
target_sources(mbgl-core PRIVATE platform/qt/src/bidi.cpp)
endif()
-
- if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
- target_add_mason_package(mbgl-core PRIVATE optional)
- endif()
endmacro()
@@ -54,10 +45,6 @@ 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)
- endif()
endmacro()
# FIXME: For now tests are disabled on Windows until we
@@ -86,6 +73,3 @@ if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
)
endmacro()
endif()
-
-target_add_mason_package(qmapboxgl PRIVATE geojson)
-target_add_mason_package(qmapboxgl PRIVATE rapidjson)
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index 323c616a64..4e781866e6 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -158,8 +158,6 @@ elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
list(APPEND MBGL_QT_CORE_FILES
PRIVATE platform/qt/src/thread.cpp
)
-
- target_add_mason_package(qmapboxgl PRIVATE optional)
elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "QNX")
list(APPEND MBGL_QT_CORE_FILES
PRIVATE platform/qt/src/thread.cpp