Skip to content

Commit 1ed8c49

Browse files
eustascopybara-github
authored andcommitted
fix iOS build
PiperOrigin-RevId: 828405754
1 parent e230f47 commit 1ed8c49

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.github/workflows/build_test.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,16 @@ jobs:
100100
cxx_compiler: g++
101101
os: macos-latest
102102

103+
- name: cmake-ios:clang
104+
build_system: cmake
105+
c_compiler: clang
106+
cxx_compiler: clang++
107+
os: macos-latest
108+
skip_tests: true # TODO(eustas): run tests in a simulator
109+
cmake_args: >-
110+
-DCMAKE_SYSTEM_NAME=iOS
111+
-DCMAKE_OSX_ARCHITECTURES=arm64
112+
103113
- name: cmake-win64:msvc-rel
104114
build_system: cmake
105115
cmake_generator: Visual Studio 17 2022
@@ -233,7 +243,9 @@ jobs:
233243
234244
cmake -B out . ${CMAKE_OPTIONS[*]} -DCMAKE_C_FLAGS='${{ matrix.c_flags || '' }}'
235245
cmake --build out ${CMAKE_BUILD_OPTIONS[*]}
236-
cd out; ctest ${CMAKE_TEST_OPTIONS[*]}; cd ..
246+
cd out
247+
[ ! -z '${{ matrix.skip_tests || '' }}' ] || ctest ${CMAKE_TEST_OPTIONS[*]}
248+
cd ..
237249
238250
- name: Quick Fuzz
239251
if: ${{ matrix.build_system == 'fuzz' }}

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ endif()
180180
if (BROTLI_BUILD_TOOLS)
181181
add_executable(brotli c/tools/brotli.c)
182182
target_link_libraries(brotli ${BROTLI_LIBRARIES})
183+
# brotli is a CLI tool
184+
set_target_properties(brotli PROPERTIES MACOSX_BUNDLE OFF)
183185
endif()
184186

185187
# Installation

0 commit comments

Comments
 (0)