fix iOS build PiperOrigin-RevId: 826503992
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index fe7206b..4533dde 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml
@@ -100,6 +100,16 @@ cxx_compiler: g++ os: macos-latest + - name: cmake-ios:clang + build_system: cmake + c_compiler: clang + cxx_compiler: clang++ + os: macos-latest + skip_tests: true # TODO(eustas): run tests in a simulator + cmake_args: >- + -DCMAKE_SYSTEM_NAME=iOS + -DCMAKE_OSX_ARCHITECTURES=arm64 + - name: cmake-win64:msvc-rel build_system: cmake cmake_generator: Visual Studio 17 2022 @@ -233,7 +243,9 @@ cmake -B out . ${CMAKE_OPTIONS[*]} -DCMAKE_C_FLAGS='${{ matrix.c_flags || '' }}' cmake --build out ${CMAKE_BUILD_OPTIONS[*]} - cd out; ctest ${CMAKE_TEST_OPTIONS[*]}; cd .. + cd out + [ ! -z '${{ matrix.skip_tests || '' }}' ] || ctest ${CMAKE_TEST_OPTIONS[*]} + cd .. - name: Quick Fuzz if: ${{ matrix.build_system == 'fuzz' }}
diff --git a/CMakeLists.txt b/CMakeLists.txt index 22b21d2..d48e998 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -180,6 +180,8 @@ if (BROTLI_BUILD_TOOLS) add_executable(brotli c/tools/brotli.c) target_link_libraries(brotli ${BROTLI_LIBRARIES}) + # brotli is a CLI tool + set_target_properties(brotli PROPERTIES MACOSX_BUNDLE OFF) endif() # Installation