From 2c5a4e64160111936b634e07cfa76f279cbd8c41 Mon Sep 17 00:00:00 2001 From: Benjamin Winger Date: Sun, 10 Apr 2022 15:26:25 -0400 Subject: [PATCH] Set ICU_ROOT instead of PKG_CONFIG_PATH to find ICU on macos --- CI/before_install.osx.sh | 1 - CI/before_script.osx.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 6871787e22..ba269ae0e0 100755 --- a/CI/before_install.osx.sh +++ b/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 diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 8b2c9c6f01..c4bb1d1a64 100755 --- a/CI/before_script.osx.sh +++ b/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" \ ..