Prechádzať zdrojové kódy

Pin libicu version for now

Set `EMBED_ICU` flag
Lukas Kurz 5 mesiacov pred
rodič
commit
eb50a13e29
2 zmenil súbory, kde vykonal 5 pridanie a 5 odobranie
  1. 3 3
      .cirrus.yml
  2. 2 2
      azure-pipelines.yml

+ 3 - 3
.cirrus.yml

@@ -8,7 +8,7 @@ task:
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-xcode
   Dependencies_script:  brew install ninja icu4c && mkdir -p build
-  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 ..
+  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 ..
   Build_script: cd build && ninja
   Test_script: cd build && ninja check
 
@@ -17,7 +17,7 @@ task:
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-xcode
   Dependencies_script:  brew install ninja icu4c && mkdir -p build
-  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 ..
+  CMake_script: cd build && cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBED_ICU=ON -DDISABLE_JIT=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang ..
   Build_script: cd build && ninja
   Test_script: cd build && ninja check
 
@@ -26,6 +26,6 @@ task:
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-xcode
   Dependencies_script:  brew install ninja icu4c && mkdir -p build
-  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 ..
+  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 ..
   Build_script: cd build && ninja
   Test_script: cd build && ninja check

+ 2 - 2
azure-pipelines.yml

@@ -71,12 +71,12 @@ jobs:
           image_name: 'macOS-latest'
           deps: 'brew install ninja icu4c'
           build_type: 'RelWithDebInfo'
-          libtype_flag: '-DICU_INCLUDE_PATH=/usr/local/opt/icu4c/include'
+          libtype_flag: '-DEMBED_ICU=ON'
         OSX.Release:
           image_name: 'macOS-latest'
           deps: 'brew install ninja icu4c'
           build_type: 'Release'
-          libtype_flag: '-DICU_INCLUDE_PATH=/usr/local/opt/icu4c/include'
+          libtype_flag: '-DEMBED_ICU=ON'
 
     pool:
       vmImage: $(image_name)