Skip to content

Commit 04b48d8

Browse files
committed
测试m1编译结果
1 parent e885ab1 commit 04b48d8

File tree

3 files changed

+30
-17
lines changed

3 files changed

+30
-17
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[*.yaml]
2+
indent_style = space
3+
indent_size = 2
14

25
[*]
36

.github/workflows/build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,23 @@ jobs:
2929
echo "CC=gcc-11" >> $GITHUB_ENV
3030
echo "CXX=g++-11" >> $GITHUB_ENV
3131
- name: Build-Release
32+
if: ! startsWith(matrix.platform, 'darwin-arm64')
3233
run: |
3334
mkdir build
3435
cd build
3536
cmake .. -DCMAKE_USER_MAKE_RULES_OVERRIDE="${{ github.workspace }}/cmake/flags_override.cmake"
3637
cmake --build . --config Release
3738
ctest -V -C Release
3839
cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
40+
- name: Build-macox-arm64
41+
if: startsWith(matrix.platform, 'darwin-arm64')
42+
run: |
43+
mkdir build
44+
cd build
45+
cmake .. -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64
46+
cmake --build . --config Release
47+
ctest -V -C Release
48+
cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
3949
- name: Upload
4050
uses: actions/upload-artifact@v2
4151
with:

cmake/flags_override.cmake

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# see https://cloud.tencent.com/developer/article/1011688
22
if(MSVC)
3-
# Use the static C library for all build types
4-
MESSAGE(STATUS "link to static C and C++ runtime lirbary(/MT /MTd)")
5-
foreach(var
6-
CMAKE_C_FLAGS_DEBUG_INIT
7-
CMAKE_C_FLAGS_RELEASE_INIT
8-
CMAKE_C_FLAGS_MINSIZEREL_INIT
9-
CMAKE_C_FLAGS_RELWITHDEBINFO_INIT
10-
CMAKE_CXX_FLAGS_DEBUG_INIT
11-
CMAKE_CXX_FLAGS_RELEASE_INIT
12-
CMAKE_CXX_FLAGS_MINSIZEREL_INIT
13-
CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT
14-
)
15-
if(${var} MATCHES "/MD")
16-
string(REGEX REPLACE "/MD" "/MT" ${var} "${${var}}")
17-
MESSAGE(STATUS "${var}:${${var}}")
18-
endif()
19-
endforeach()
3+
# Use the static C library for all build types
4+
MESSAGE(STATUS "link to static C and C++ runtime lirbary(/MT /MTd)")
5+
foreach(var
6+
CMAKE_C_FLAGS_DEBUG_INIT
7+
CMAKE_C_FLAGS_RELEASE_INIT
8+
CMAKE_C_FLAGS_MINSIZEREL_INIT
9+
CMAKE_C_FLAGS_RELWITHDEBINFO_INIT
10+
CMAKE_CXX_FLAGS_DEBUG_INIT
11+
CMAKE_CXX_FLAGS_RELEASE_INIT
12+
CMAKE_CXX_FLAGS_MINSIZEREL_INIT
13+
CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT
14+
)
15+
if(${var} MATCHES "/MD")
16+
string(REGEX REPLACE "/MD" "/MT" ${var} "${${var}}")
17+
MESSAGE(STATUS "${var}:${${var}}")
18+
endif()
19+
endforeach()
2020
endif(MSVC)

0 commit comments

Comments
 (0)