File tree Expand file tree Collapse file tree 4 files changed +46
-8
lines changed
Expand file tree Collapse file tree 4 files changed +46
-8
lines changed Original file line number Diff line number Diff line change 1+ parse :
2+ additional_commands :
3+ _add_boost_lib :
4+ # flags:
5+ kwargs :
6+ NAME : ' 1'
7+ CXXFLAGS_PRIVATE : ' *'
8+ DEFINE : ' *'
9+ DEFINE_PRIVATE : ' *'
10+ INCLUDE_PRIVATE : ' *'
11+ LINK : ' *'
12+ SOURCES : ' *'
13+ _add_boost_test :
14+ # flags:
15+ kwargs :
16+ NAME : ' 1'
17+ RUN : ' 1'
18+ DEFINE : ' *'
19+ LINK : ' *'
20+ TESTS : ' *'
21+
22+ format :
23+ dangle_parens : true
24+ line_ending : unix
25+ line_width : 123
26+ max_lines_hwrap : 3
27+ max_pargs_hwrap : 4
28+ max_rows_cmdline : 8
29+ max_subgroups_hwrap : 4
30+ min_prefix_chars : 8
31+ separate_ctrl_name_with_space : false
32+ separate_fn_name_with_space : false
33+ tab_size : 2
34+
35+ markup :
36+ bullet_char : " *"
37+ enum_char : .
38+ enable_markup : false
Original file line number Diff line number Diff line change @@ -27,11 +27,11 @@ strategy:
2727 iOS :
2828 imageName : ' macos-latest'
2929 BUILD_TARGET : ' iOS'
30- Windows-v141 -amd64 :
31- imageName : ' vs2017-win2016 '
30+ Windows-2019 -amd64 :
31+ imageName : ' windows-2019 '
3232 BUILD_TARGET : ' Windows'
3333 BUILD_TOOLCHAIN : ' amd64'
34- Windows-v161 -amd64 :
34+ Windows-latest -amd64 :
3535 imageName : ' windows-latest'
3636 BUILD_TARGET : ' Windows'
3737 BUILD_TOOLCHAIN : ' amd64'
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ build_install() {
3333 sudo apt-get install \
3434 build-essential \
3535 g++ \
36- clang \
36+ clang-12 \
3737 aria2 \
3838 ninja-build \
3939 ccache
@@ -50,7 +50,7 @@ build_install() {
5050
5151 # Android NDK
5252 if [[ " $BUILD_TARGET " == " Android" ]]; then
53- download_extract_zip http://dl.google.com/android/repository/${NDK_VER} -linux-x86_64 .zip ${NDK_VER} -linux-x86_64 .zip
53+ download_extract_zip http://dl.google.com/android/repository/${NDK_VER} -linux.zip ${NDK_VER} -linux.zip
5454 export ANDROID_NDK=$( pwd) /${NDK_VER}
5555 fi
5656}
@@ -64,8 +64,8 @@ build_script() {
6464 CC=gcc
6565 CXX=g++
6666 else
67- CC=clang
68- CXX=clang
67+ CC=clang-12
68+ CXX=clang++-12
6969 fi
7070 cmake .. -GNinja \
7171 -DCMAKE_C_COMPILER=$CC \
Original file line number Diff line number Diff line change 11function (_add_boost_lib)
2- set (options )
2+ set (options )
33 set (oneValueArgs NAME )
44 set (multiValueArgs SOURCES LINK DEFINE DEFINE_PRIVATE CXXFLAGS_PRIVATE INCLUDE_PRIVATE)
55 cmake_parse_arguments (BOOSTLIB "${options} " "${oneValueArgs} " "${multiValueArgs} " ${ARGN} )
You can’t perform that action at this time.
0 commit comments