Merge branch 'icu-fix2' into 'master'

Detect ICU on macOS

See merge request OpenMW/openmw!1760

CI/before_install.osx.sh

@@ -16,7 +16,6 @@ command -v qmake >/dev/null 2>&1 || brew install qt@5
 brew install icu4c
 brew install yaml-cpp
 export PATH="/usr/local/opt/qt@5/bin:$PATH"  # needed to use qmake in none default path as qt now points to qt6
-export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
 
 ccache --version
 cmake --version

CI/before_script.osx.sh

@@ -26,5 +26,6 @@ cmake \
 -D BUILD_BSATOOL=TRUE \
 -D BUILD_ESSIMPORTER=TRUE \
 -D BUILD_NIFTEST=TRUE \
+-D ICU_ROOT="/usr/local/opt/icu4c"
 -G"Unix Makefiles" \
 ..

CMakeLists.txt

@@ -251,7 +251,7 @@ set(USED_OSG_PLUGINS
 
 option(OPENMW_USE_SYSTEM_ICU "Use system ICU library instead of internal. If disabled, requires autotools" ON)
 if(OPENMW_USE_SYSTEM_ICU)
-    find_package(ICU COMPONENTS uc i18n)
+    find_package(ICU REQUIRED COMPONENTS uc i18n)
 endif()
 
 option(OPENMW_USE_SYSTEM_YAML_CPP "Use system yaml-cpp library instead of internal." ON)
@@ -262,7 +262,7 @@ else()
 endif()
 option(YAML_CPP_STATIC "Link static build of yaml-cpp into the binaries" ${_yaml_cpp_static_default})
 if (OPENMW_USE_SYSTEM_YAML_CPP)
-    find_package(yaml-cpp)
+    find_package(yaml-cpp REQUIRED)
 endif()
 
 add_subdirectory(extern)