File tree 2 files changed +23
-21
lines changed
2 files changed +23
-21
lines changed Original file line number Diff line number Diff line change 1
- ---
1
+ ---
2
2
dist : xenial
3
3
language : cpp
4
4
sudo : required
5
5
6
- matrix :
7
- include :
8
- -
6
+ matrix :
7
+ include :
8
+ -
9
9
compiler : clang
10
10
env : COMPILER='clang++'
11
11
os : osx
12
12
osx_image : xcode9
13
- -
13
+ -
14
14
compiler : clang
15
15
env : COMPILER='clang++'
16
16
os : osx
17
17
osx_image : xcode10
18
- -
18
+ -
19
19
compiler : clang
20
20
env : COMPILER='clang++'
21
21
os : osx
22
22
osx_image : xcode11
23
- -
24
- addons :
25
- apt :
26
- packages :
23
+ -
24
+ addons :
25
+ apt :
26
+ packages :
27
27
- cmake
28
28
- g++-6
29
29
- lcov
30
- sources :
30
+ sources :
31
31
- ubuntu-toolchain-r-test
32
32
compiler : gcc
33
33
env : " COMPILER=g++-6 COLLECT_COVERAGE=1"
34
34
os : linux
35
- -
36
- addons :
37
- apt :
38
- packages :
35
+ -
36
+ addons :
37
+ apt :
38
+ packages :
39
39
- cmake
40
40
- clang-8
41
41
- g++-8
42
- sources :
42
+ sources :
43
43
- ubuntu-toolchain-r-test
44
44
- llvm-toolchain-xenial-8
45
45
compiler : clang
46
46
env : " COMPILER=clang++-8 EXTRA_FLAGS=-DJINJA2CPP_CXX_STANDARD=17 SANITIZE_BUILD=address+undefined"
47
47
os : linux
48
- before_install :
48
+ before_install :
49
49
- " date -u"
50
50
- " uname -a"
51
- script :
51
+ script :
52
52
- " export BUILD_TARGET=\" all\" "
53
53
- " export CMAKE_OPTS=\" -DCMAKE_VERBOSE_MAKEFILE=OFF\" "
54
54
- " if [[ \" ${COMPILER}\" != \"\" ]]; then export CXX=${COMPILER}; fi"
@@ -59,7 +59,7 @@ script:
59
59
- " mkdir -p build && cd build"
60
60
- " cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal $EXTRA_FLAGS .. && cmake --build . --config $BUILD_CONFIG --target all -- -j4"
61
61
- " ctest -C $BUILD_CONFIG -V"
62
- after_success :
62
+ after_success :
63
63
- " if [[ \" ${COLLECT_COVERAGE}\" != \"\" ]]; then echo \" Uploading code coverate report\" ; fi"
64
64
- " if [[ \" ${COLLECT_COVERAGE}\" != \"\" ]]; then lcov --directory . --capture --output-file coverage.info ; fi"
65
65
- " if [[ \" ${COLLECT_COVERAGE}\" != \"\" ]]; then lcov --remove coverage.info '/usr/*' --output-file coverage.info ; fi"
Original file line number Diff line number Diff line change @@ -17,8 +17,10 @@ endif ()
17
17
18
18
function (update_submodule submodule)
19
19
find_package (Git REQUIRED)
20
- execute_process (COMMAND ${GIT_EXECUTABLE} submodule update --init thirdparty/${submodule}
21
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR} " )
20
+ execute_process (
21
+ COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive thirdparty/${submodule}
22
+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR} "
23
+ )
22
24
endfunction ()
23
25
24
26
function (imported_target_alias ALIAS)
You can’t perform that action at this time.
0 commit comments