Skip to content

Fix/macos build #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 5, 2022
Merged

Fix/macos build #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe8bfa5
fix: add m1 mac arch for bridge
andycall Aug 4, 2022
a94bb71
release: 0.12.0+1
andycall Aug 4, 2022
54b2f58
fix: fix cppcheck actions
andycall Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/code_linter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
cppcheck:
runs-on: macos-10.15
runs-on: macos-12
name: Cppcheck
steps:
- uses: actions/checkout@v2
Expand Down
9 changes: 1 addition & 8 deletions bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
execute_process(
COMMAND bash "-c" "clang --version | xargs | awk '{print $7}' | cut -c1-5"
OUTPUT_VARIABLE CLANG_ARCH
)
## Set univeral archs for Apple arm64 processors
if (${CLANG_ARCH} MATCHES "arm64")
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
endif()
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
endif()

if (${ENABLE_PROFILE})
Expand Down
6 changes: 6 additions & 0 deletions webf/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 0.12.0+1

**Bug Fixed**

* Fix Apple silicon platform build error.

## 0.12.0

**Big News**
Expand Down
2 changes: 1 addition & 1 deletion webf/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: webf
description: A W3C standard compliant Web rendering engine based on Flutter.
version: 0.12.0
version: 0.12.0+1
homepage: https://openwebf.com

environment:
Expand Down