diff options
| author | m-stephen <truestyle2005@163.com> | 2019-11-01 10:27:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 10:27:03 +0800 |
| commit | 9427c04bc709c39f7e083b6d1597aaf33af8c302 (patch) | |
| tree | 224fa2bffbc6a81b447c76b98e4c13a51baadc29 /platform/linux/config.cmake | |
| parent | fc2c02bbc6abaef52077fe5e9e78f772e6009967 (diff) | |
| parent | 5b38cfee18800cbb3c6a3186882744592662c3d6 (diff) | |
| download | qtlocation-mapboxgl-9427c04bc709c39f7e083b6d1597aaf33af8c302.tar.gz | |
Merge branch 'master' into stephen-improve-accuracy-for-cameraupstream/stephen-improve-accuracy-for-camera
Diffstat (limited to 'platform/linux/config.cmake')
| -rw-r--r-- | platform/linux/config.cmake | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 55e6e3c192..39ae7c6d52 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -45,19 +45,18 @@ macro(mbgl_platform_core) PRIVATE platform/linux/src/gl_functions.cpp # Misc + PRIVATE platform/default/src/mbgl/i18n/collator.cpp + PRIVATE platform/default/src/mbgl/i18n/number_format.cpp + PRIVATE platform/default/src/mbgl/text/bidi.cpp + PRIVATE platform/default/src/mbgl/text/local_glyph_rasterizer.cpp + PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp PRIVATE platform/default/src/mbgl/util/compression.cpp PRIVATE platform/default/src/mbgl/util/logging_stderr.cpp + PRIVATE platform/default/src/mbgl/util/monotonic_timer.cpp PRIVATE platform/default/src/mbgl/util/string_stdlib.cpp PRIVATE platform/default/src/mbgl/util/thread.cpp - PRIVATE platform/default/src/mbgl/text/bidi.cpp - PRIVATE platform/default/src/mbgl/text/collator.cpp - PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp - PRIVATE platform/default/src/mbgl/text/local_glyph_rasterizer.cpp PRIVATE platform/default/src/mbgl/util/thread_local.cpp - PRIVATE platform/default/src/mbgl/text/unaccent.cpp - PRIVATE platform/default/include/mbgl/text/unaccent.hpp PRIVATE platform/default/src/mbgl/util/utf.cpp - PRIVATE platform/default/src/mbgl/util/format_number.cpp # Image handling PRIVATE platform/default/src/mbgl/util/image.cpp @@ -88,7 +87,7 @@ macro(mbgl_platform_core) target_add_mason_package(mbgl-core PRIVATE icu) # Ignore warning caused by ICU header unistr.h in some CI environments - set_source_files_properties(platform/default/src/mbgl/util/format_number.cpp PROPERTIES COMPILE_FLAGS -Wno-error=shadow) + set_source_files_properties(platform/default/src/mbgl/i18n/number_format.cpp PROPERTIES COMPILE_FLAGS -Wno-error=shadow) # Link all ICU libraries (by default only libicuuc is linked) find_library(LIBICUI18N NAMES icui18n HINTS ${MASON_PACKAGE_icu_INCLUDE_DIRS}/../lib) |