summaryrefslogtreecommitdiff
path: root/platform/qt
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-07-23 17:35:43 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-09-17 12:28:55 +0300
commit8ee6cfa8fb022a7319ce83e795f4ff0d7e747ad7 (patch)
treefa7315445fd2808c35ac852f186ca592ba56b898 /platform/qt
parente3421e042fe720d4d7b13457c4597921f31f3bcd (diff)
downloadqtlocation-mapboxgl-8ee6cfa8fb022a7319ce83e795f4ff0d7e747ad7.tar.gz
[build] Cosmetics on vendor packages
- Add include guards on all the files - Add a vendor package for sqlite and gtest - Use relative paths to all the files
Diffstat (limited to 'platform/qt')
-rw-r--r--platform/qt/config.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index 9249f846e8..b4a486b08b 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -13,7 +13,7 @@ macro(mbgl_platform_core)
target_link_libraries(mbgl-core PRIVATE
${MBGL_QT_CORE_LIBRARIES}
- nunicode
+ mbgl-vendor-nunicode
)
if(NOT WITH_QT_DECODERS)
@@ -30,7 +30,7 @@ macro(mbgl_platform_core)
if(NOT WITH_QT_I18N)
target_sources(mbgl-core PRIVATE platform/default/src/mbgl/text/bidi.cpp)
- target_link_libraries(mbgl-core PRIVATE icu)
+ target_link_libraries(mbgl-core PRIVATE mbgl-vendor-icu)
else()
target_sources(mbgl-core PRIVATE platform/qt/src/bidi.cpp)
endif()