From cb14b65aad860a79f949fa1e6986cffeba5e3509 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 14 Oct 2020 20:50:38 +0200 Subject: CMake: Fix build errors exposed by making common dependent on fmt --- Source/Android/jni/AndroidCommon/CMakeLists.txt | 1 + Source/Android/jni/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) (limited to 'Source/Android') diff --git a/Source/Android/jni/AndroidCommon/CMakeLists.txt b/Source/Android/jni/AndroidCommon/CMakeLists.txt index e8bcc22863..c9c48e067a 100644 --- a/Source/Android/jni/AndroidCommon/CMakeLists.txt +++ b/Source/Android/jni/AndroidCommon/CMakeLists.txt @@ -8,6 +8,7 @@ add_library(androidcommon STATIC target_link_libraries(androidcommon PRIVATE android + common log "-Wl,--no-warn-mismatch" "-Wl,--whole-archive" diff --git a/Source/Android/jni/CMakeLists.txt b/Source/Android/jni/CMakeLists.txt index 2b8329f99a..7f31a144aa 100644 --- a/Source/Android/jni/CMakeLists.txt +++ b/Source/Android/jni/CMakeLists.txt @@ -10,6 +10,7 @@ add_library(main SHARED target_link_libraries(main PRIVATE androidcommon + common core uicommon ) -- cgit v1.2.3