From 38db0764af5ffbba925ce82227fbe2ed361f660f Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 7 Aug 2022 18:06:36 +0200
Subject: [PATCH] Require ICU

---
 .github/workflows/ccpp.yml |  2 +-
 CMakeLists.txt             | 13 +++++++++----
 src/CMakeLists.txt         | 28 +++++++++++++++++-----------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 70246ca7..a2d032a8 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -2109,7 +2109,7 @@ jobs:
           GST_PLUGIN_SCANNER: /usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner
           GST_PLUGIN_PATH: /usr/local/lib/gstreamer-1.0
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_QT6=ON -DBUILD_WERROR=OFF -DUSE_BUNDLE=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt6/lib/cmake
+        run: cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_QT6=ON -DBUILD_WERROR=OFF -DUSE_BUNDLE=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt6/lib/cmake -DICU_ROOT=/usr/local/opt/icu4c
 
       - name: Build
         working-directory: build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c159aa5f..7242eea8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,8 @@ if(CCACHE_EXECUTABLE)
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE})
 endif()
 
+option(USE_ICU "Use ICU" ON)
+
 find_package(PkgConfig REQUIRED)
 find_package(Boost REQUIRED)
 find_package(Threads)
@@ -104,10 +106,13 @@ find_package(Backtrace)
 if(Backtrace_FOUND)
   set(HAVE_BACKTRACE ON)
 endif()
-find_package(Iconv)
-find_package(ICU COMPONENTS uc i18n)
-if(ICU_FOUND)
-  set(HAVE_ICU ON)
+if(USE_ICU)
+  find_package(ICU COMPONENTS uc i18n REQUIRED)
+  if(ICU_FOUND)
+    set(HAVE_ICU ON)
+  endif()
+else()
+  find_package(Iconv)
 endif()
 find_package(GnuTLS REQUIRED)
 find_package(Protobuf REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 64540837..5e3f62fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -944,9 +944,14 @@ link_directories(
   ${SQLITE_LIBRARY_DIRS}
   ${SINGLEAPPLICATION_LIBRARY_DIRS}
   ${SINGLECOREAPPLICATION_LIBRARY_DIRS}
-  ${Iconv_LIBRARY_DIRS}
 )
 
+if(HAVE_ICU)
+  link_directories(${ICU_LIBRARY_DIRS})
+else()
+  link_directories(${Iconv_LIBRARY_DIRS})
+endif()
+
 if(HAVE_ALSA)
   link_directories(${ALSA_LIBRARY_DIRS})
 endif()
@@ -1058,11 +1063,21 @@ target_link_libraries(strawberry_lib PUBLIC
   ${QT_LIBRARIES}
   ${SINGLEAPPLICATION_LIBRARIES}
   ${SINGLECOREAPPLICATION_LIBRARIES}
-  ${Iconv_LIBRARIES}
   libstrawberry-common
   libstrawberry-tagreader
 )
 
+if(HAVE_ICU)
+  target_include_directories(strawberry_lib SYSTEM PRIVATE ${ICU_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${ICU_LIBRARIES})
+else()
+  if(FREEBSD AND NOT Iconv_LIBRARIES)
+    set(Iconv_LIBRARIES iconv)
+  endif()
+  target_include_directories(strawberry_lib SYSTEM PRIVATE ${Iconv_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${Iconv_LIBRARIES})
+endif()
+
 if(HAVE_ALSA)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${ALSA_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${ALSA_LIBRARIES})
@@ -1141,15 +1156,6 @@ if(HAVE_LIBMTP)
   target_link_libraries(strawberry_lib PRIVATE ${LIBMTP_LIBRARIES})
 endif()
 
-if(FREEBSD)
-  target_link_libraries(strawberry_lib PRIVATE iconv)
-endif()
-
-if(HAVE_ICU)
-  target_include_directories(strawberry_lib SYSTEM PRIVATE ${ICU_INCLUDE_DIRS})
-  target_link_libraries(strawberry_lib PRIVATE ${ICU_LIBRARIES})
-endif()
-
 if(APPLE)
   target_link_libraries(strawberry_lib PRIVATE
     "-framework AppKit"