From 5a6ddb2ea666e895890d3cb690cce5101cf12652 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 7 Nov 2019 17:15:21 +0100
Subject: Fallback fonts can have first crack at adding an unknown character +
 set Twemoji as the viewer's fallback for all emoji blocks

---
 indra/cmake/ICU4C.cmake | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 indra/cmake/ICU4C.cmake

(limited to 'indra/cmake/ICU4C.cmake')

diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
new file mode 100644
index 0000000000..007a9b6937
--- /dev/null
+++ b/indra/cmake/ICU4C.cmake
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(ICU4C_FIND_QUIETLY ON)
+set(ICU4C_FIND_REQUIRED ON)
+
+if (USESYSTEMLIBS)
+  include(FindICU4C)
+else (USESYSTEMLIBS)
+  use_prebuilt_binary(icu4c)
+  if (WINDOWS)
+    set(ICU4C_LIBRARY icuuc)
+  #elseif(DARWIN)
+  #  set(ICU4C_LIBRARY ...)
+  #elseif(LINUX)
+  #  set(ICU4C_LIBRARY ...)
+  else()
+    message(FATAL_ERROR "Invalid platform")
+  endif()
+  set(ICU4C_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/unicode)
+  use_prebuilt_binary(dictionaries)
+endif (USESYSTEMLIBS)
-- 
cgit v1.2.3


From da0335c864477036ba996fbab4db2194535466d7 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 25 Jan 2023 20:31:04 +0100
Subject: Fix Mac build   - Link against ICU4C   - Font files were only copied
 on Windows builds   - Replace missing variable

---
 indra/cmake/ICU4C.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake/ICU4C.cmake')

diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index 007a9b6937..b51087e0e7 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -10,8 +10,8 @@ else (USESYSTEMLIBS)
   use_prebuilt_binary(icu4c)
   if (WINDOWS)
     set(ICU4C_LIBRARY icuuc)
-  #elseif(DARWIN)
-  #  set(ICU4C_LIBRARY ...)
+  elseif(DARWIN)
+    set(ICU4C_LIBRARY icuuc)
   #elseif(LINUX)
   #  set(ICU4C_LIBRARY ...)
   else()
-- 
cgit v1.2.3


From 337d2f984ff7f448fdbdc8dc2448e2b67cd23572 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 4 Apr 2023 03:32:40 +0200
Subject: Fix CMake files related to ICU4C

---
 indra/cmake/ICU4C.cmake | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'indra/cmake/ICU4C.cmake')

diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index b51087e0e7..7b27665483 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -1,22 +1,23 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-set(ICU4C_FIND_QUIETLY ON)
-set(ICU4C_FIND_REQUIRED ON)
+include_guard()
 
-if (USESYSTEMLIBS)
-  include(FindICU4C)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(icu4c)
-  if (WINDOWS)
-    set(ICU4C_LIBRARY icuuc)
-  elseif(DARWIN)
-    set(ICU4C_LIBRARY icuuc)
-  #elseif(LINUX)
-  #  set(ICU4C_LIBRARY ...)
-  else()
-    message(FATAL_ERROR "Invalid platform")
-  endif()
-  set(ICU4C_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/unicode)
-  use_prebuilt_binary(dictionaries)
-endif (USESYSTEMLIBS)
+add_library( ll::icu4c INTERFACE IMPORTED )
+
+
+use_system_binary(icu4c)
+use_prebuilt_binary(icu4c)
+if (WINDOWS)
+  target_link_libraries( ll::icu4c INTERFACE  icuuc)
+elseif(DARWIN)
+  target_link_libraries( ll::icu4c INTERFACE  icuuc)
+#elseif(LINUX)
+##  target_link_libraries( ll::icu4c INTERFACE  )
+else()
+  message(FATAL_ERROR "Invalid platform")
+endif()
+
+target_include_directories( ll::icu4c SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/unicode )
+
+use_prebuilt_binary(dictionaries)
-- 
cgit v1.2.3