Skip to content

Commit cd81a22

Browse files
Use icu4c on MacOS again
1 parent 177a3e0 commit cd81a22

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ task:
88
macos_instance:
99
image: ghcr.io/cirruslabs/macos-ventura-xcode
1010
Dependencies_script: brew install ninja icu4c && mkdir -p build
11-
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DSTATIC_LIBRARY=ON -DEMBED_ICU=ON -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
11+
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DSTATIC_LIBRARY=ON -DICU_INCLUDE_PATH=/opt/homebrew/opt/icu4c/include -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
1212
Build_script: cd build && ninja
1313
Test_script: cd build && ninja check
1414

@@ -17,7 +17,7 @@ task:
1717
macos_instance:
1818
image: ghcr.io/cirruslabs/macos-ventura-xcode
1919
Dependencies_script: brew install ninja icu4c && mkdir -p build
20-
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBED_ICU=ON -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
20+
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DICU_INCLUDE_PATH=/opt/homebrew/opt/icu4c/include -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
2121
Build_script: cd build && ninja
2222
Test_script: cd build && ninja check
2323

@@ -26,6 +26,6 @@ task:
2626
macos_instance:
2727
image: ghcr.io/cirruslabs/macos-ventura-xcode
2828
Dependencies_script: brew install ninja icu4c && mkdir -p build
29-
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBRARY=ON -DEMBED_ICU=ON -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
29+
CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBRARY=ON -DICU_INCLUDE_PATH=/opt/homebrew/opt/icu4c/include -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
3030
Build_script: cd build && ninja
3131
Test_script: cd build && ninja check

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ jobs:
7171
image_name: 'macOS-latest'
7272
deps: 'brew install ninja icu4c'
7373
build_type: 'RelWithDebInfo'
74-
libtype_flag: '-DEMBED_ICU=ON'
74+
libtype_flag: '-DICU_INCLUDE_PATH=/usr/local/opt/icu4c/include'
7575
OSX.Release:
7676
image_name: 'macOS-latest'
7777
deps: 'brew install ninja icu4c'
7878
build_type: 'Release'
79-
libtype_flag: '-DEMBED_ICU=ON'
79+
libtype_flag: '-DICU_INCLUDE_PATH=/usr/local/opt/icu4c/include'
8080

8181
pool:
8282
vmImage: $(image_name)

0 commit comments

Comments
 (0)