[build] ICU is now configured per platform

10 files changed, 18 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b0c7e110f..f0f3d80cb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,6 @@ mason_use(earcut VERSION 0.12.1 HEADER_ONLY)
 mason_use(protozero VERSION 1.4.2 HEADER_ONLY)
 mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY)
 mason_use(geojson VERSION 0.4.0 HEADER_ONLY)
-mason_use(icu VERSION 58.1)
 
 if(WITH_COVERAGE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index c9e581737f..3255da66f2 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -324,7 +324,6 @@ set(MBGL_CORE_FILES
     src/mbgl/style/sources/vector_source_impl.hpp
 
     # text
-    src/mbgl/text/bidi.cpp
     src/mbgl/text/bidi.hpp
     src/mbgl/text/check_max_angle.cpp
     src/mbgl/text/check_max_angle.hpp
diff --git a/cmake/core.cmake b/cmake/core.cmake
index 9c1bf4a6f2..bc5e7eb718 100644
--- a/cmake/core.cmake
+++ b/cmake/core.cmake
@@ -45,7 +45,6 @@ target_add_mason_package(mbgl-core PRIVATE supercluster)
 target_add_mason_package(mbgl-core PRIVATE kdbush)
 target_add_mason_package(mbgl-core PRIVATE earcut)
 target_add_mason_package(mbgl-core PRIVATE protozero)
-target_add_mason_package(mbgl-core PRIVATE icu)
 
 mbgl_platform_core()
 
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index 32745720e5..635c27a44f 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -25,6 +25,7 @@ mason_use(libzip VERSION 1.1.3)
 mason_use(nunicode VERSION 1.7.1)
 mason_use(sqlite VERSION 3.14.2)
 mason_use(gtest VERSION 1.7.0)
+mason_use(icu VERSION 58.1)
 
 set(ANDROID_SDK_PROJECT_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK)
 set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID_JNIDIR})
@@ -77,6 +78,7 @@ macro(mbgl_platform_core)
         # Misc
         PRIVATE platform/android/src/logging_android.cpp
         PRIVATE platform/default/string_stdlib.cpp
+        PRIVATE platform/default/bidi.cpp
 
         # Image handling
         PRIVATE platform/default/image.cpp
@@ -163,6 +165,7 @@ macro(mbgl_platform_core)
     target_add_mason_package(mbgl-core PUBLIC geojson)
     target_add_mason_package(mbgl-core PUBLIC jni.hpp)
     target_add_mason_package(mbgl-core PUBLIC rapidjson)
+    target_add_mason_package(mbgl-core PUBLIC icu)
 
     target_compile_options(mbgl-core
         PRIVATE -fvisibility=hidden
diff --git a/src/mbgl/text/bidi.cpp b/platform/default/bidi.cpp
index 7d5f6313bc..7d5f6313bc 100644
--- a/src/mbgl/text/bidi.cpp
+++ b/platform/default/bidi.cpp
diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake
index 195687fea5..12db02921c 100644
--- a/platform/ios/config.cmake
+++ b/platform/ios/config.cmake
@@ -1,5 +1,7 @@
 add_definitions(-DMBGL_USE_GLES2=1)
 
+mason_use(icu VERSION 58.1)
+
 macro(mbgl_platform_core)
     set_xcode_property(mbgl-core IPHONEOS_DEPLOYMENT_TARGET "8.0")
     set_xcode_property(mbgl-core ENABLE_BITCODE "YES")
@@ -38,6 +40,7 @@ macro(mbgl_platform_core)
         PRIVATE platform/darwin/src/logging_nslog.mm
         PRIVATE platform/darwin/src/nsthread.mm
         PRIVATE platform/darwin/src/string_nsstring.mm
+        PRIVATE platform/default/bidi.cpp
 
         # Image handling
         PRIVATE platform/darwin/src/image.mm
@@ -57,6 +60,7 @@ macro(mbgl_platform_core)
     )
 
     target_add_mason_package(mbgl-core PUBLIC geojson)
+    target_add_mason_package(mbgl-core PUBLIC icu)
 
     target_compile_options(mbgl-core
         PRIVATE -fobjc-arc
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index f71d8aa4f9..51aecb86a9 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -11,6 +11,7 @@ mason_use(libjpeg-turbo VERSION 1.5.0)
 mason_use(webp VERSION 0.5.1)
 mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
 mason_use(benchmark VERSION 1.0.0)
+mason_use(icu VERSION 58.1)
 
 include(cmake/loop-uv.cmake)
 
@@ -70,6 +71,7 @@ macro(mbgl_platform_core)
         PRIVATE platform/default/logging_stderr.cpp
         PRIVATE platform/default/string_stdlib.cpp
         PRIVATE platform/default/thread.cpp
+        PRIVATE platform/default/bidi.cpp
 
         # Image handling
         PRIVATE platform/default/image.cpp
@@ -98,6 +100,7 @@ macro(mbgl_platform_core)
     target_add_mason_package(mbgl-core PUBLIC libpng)
     target_add_mason_package(mbgl-core PUBLIC libjpeg-turbo)
     target_add_mason_package(mbgl-core PUBLIC webp)
+    target_add_mason_package(mbgl-core PUBLIC icu)
 
     target_link_libraries(mbgl-core
         PUBLIC -lz
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index 207ac3257c..af274f7fc2 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -4,6 +4,7 @@ mason_use(glfw VERSION 3.2.1)
 mason_use(boost_libprogram_options VERSION 1.62.0)
 mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
 mason_use(benchmark VERSION 1.0.0)
+mason_use(icu VERSION 58.1)
 
 include(cmake/loop-darwin.cmake)
 
@@ -37,6 +38,7 @@ macro(mbgl_platform_core)
         PRIVATE platform/darwin/src/logging_nslog.mm
         PRIVATE platform/darwin/src/nsthread.mm
         PRIVATE platform/darwin/src/string_nsstring.mm
+        PRIVATE platform/default/bidi.cpp
 
         # Image handling
         PRIVATE platform/darwin/src/image.mm
@@ -56,6 +58,7 @@ macro(mbgl_platform_core)
     )
 
     target_add_mason_package(mbgl-core PUBLIC geojson)
+    target_add_mason_package(mbgl-core PUBLIC icu)
 
     target_compile_options(mbgl-core
         PRIVATE -fobjc-arc
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index 30781fa428..f6b7d509f8 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -2,6 +2,7 @@ include(platform/qt/qt.cmake)
 
 mason_use(sqlite VERSION 3.14.2)
 mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
+mason_use(icu VERSION 58.1)
 
 if(NOT WITH_QT_DECODERS)
     mason_use(libjpeg-turbo VERSION 1.5.0)
@@ -38,6 +39,9 @@ macro(mbgl_platform_core)
     else()
         add_definitions(-DQT_IMAGE_DECODERS)
     endif()
+
+    target_add_mason_package(mbgl-core PRIVATE icu)
+
 endmacro()
 
 macro(mbgl_platform_test)
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index 3efdf6cad8..c640ca5689 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -29,6 +29,7 @@ set(MBGL_QT_FILES
 
     # Misc
     PRIVATE platform/default/logging_stderr.cpp
+    PRIVATE platform/default/bidi.cpp
 
     # Thread pool
     PRIVATE platform/default/mbgl/util/default_thread_pool.cpp