From 282c71e8e9a8ec9c2eab612f2e60a71b15d24c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 18 Oct 2018 17:33:27 +0200
Subject: [core] unify UTF-8/16 conversion to <boost/locale/encoding_utf.hpp>

---
 cmake/codecvt.cmake            | 19 -------------------
 cmake/core.cmake               |  2 --
 cmake/mason-dependencies.cmake |  2 +-
 3 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 cmake/codecvt.cmake

(limited to 'cmake')

diff --git a/cmake/codecvt.cmake b/cmake/codecvt.cmake
deleted file mode 100644
index 8228a6df6b..0000000000
--- a/cmake/codecvt.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-add_library(codecvt INTERFACE)
-
-# Determine if the STL has codecvt
-file(WRITE "${CMAKE_BINARY_DIR}/features/codecvt/main.cpp" "#include <codecvt>\nint main() {}")
-try_compile(STL_SUPPORTS_CODECVT
-    "${CMAKE_BINARY_DIR}/features/codecvt"
-    SOURCES "${CMAKE_BINARY_DIR}/features/codecvt/main.cpp"
-    CMAKE_FLAGS "-DCMAKE_MACOSX_BUNDLE:STRING=YES" "-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED:STRING=NO"
-    COMPILE_DEFINITIONS "-std=c++14" # CXX_STANDARD wasn't added to try_compile until CMake 3.8
-    OUTPUT_VARIABLE CODECVT_TEST_OUTPUT
-)
-
-if (NOT STL_SUPPORTS_CODECVT)
-    if ($ENV{V})
-        message("codecvt support not detected: ${CODECVT_TEST_OUTPUT}")
-    endif()
-    target_include_directories(codecvt INTERFACE platform/default/codecvt)
-    target_add_mason_package(codecvt INTERFACE boost)
-endif()
diff --git a/cmake/core.cmake b/cmake/core.cmake
index 1b29b4fb08..32e77f5d55 100644
--- a/cmake/core.cmake
+++ b/cmake/core.cmake
@@ -7,8 +7,6 @@ target_include_directories(mbgl-core
     PRIVATE src
 )
 
-target_link_libraries(mbgl-core PRIVATE codecvt)
-
 target_add_mason_package(mbgl-core PUBLIC geometry)
 target_add_mason_package(mbgl-core PUBLIC variant)
 target_add_mason_package(mbgl-core PRIVATE unique_resource)
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake
index 160060a6fa..79d343ac8b 100644
--- a/cmake/mason-dependencies.cmake
+++ b/cmake/mason-dependencies.cmake
@@ -19,7 +19,7 @@ mason_use(cheap-ruler VERSION 2.5.3 HEADER_ONLY)
 mason_use(vector-tile VERSION 1.0.2 HEADER_ONLY)
 
 if(MBGL_PLATFORM STREQUAL "android")
-    mason_use(jni.hpp VERSION 4.0.0 HEADER_ONLY)
+    mason_use(jni.hpp VERSION 4.0.1 HEADER_ONLY)
 elseif(MBGL_PLATFORM STREQUAL "ios")
     # noop
 elseif(MBGL_PLATFORM STREQUAL "linux")
-- 
cgit v1.2.1