Skip to content

Commit 15a5f76

Browse files
committed
fix submodule recurse init
1 parent f0234d1 commit 15a5f76

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

.travis.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
---
1+
---
22
dist: xenial
33
language: cpp
44
sudo: required
55

6-
matrix:
7-
include:
8-
-
6+
matrix:
7+
include:
8+
-
99
compiler: clang
1010
env: COMPILER='clang++'
1111
os: osx
1212
osx_image: xcode9
13-
-
13+
-
1414
compiler: clang
1515
env: COMPILER='clang++'
1616
os: osx
1717
osx_image: xcode10
18-
-
18+
-
1919
compiler: clang
2020
env: COMPILER='clang++'
2121
os: osx
2222
osx_image: xcode11
23-
-
24-
addons:
25-
apt:
26-
packages:
23+
-
24+
addons:
25+
apt:
26+
packages:
2727
- cmake
2828
- g++-6
2929
- lcov
30-
sources:
30+
sources:
3131
- ubuntu-toolchain-r-test
3232
compiler: gcc
3333
env: "COMPILER=g++-6 COLLECT_COVERAGE=1"
3434
os: linux
35-
-
36-
addons:
37-
apt:
38-
packages:
35+
-
36+
addons:
37+
apt:
38+
packages:
3939
- cmake
4040
- clang-8
4141
- g++-8
42-
sources:
42+
sources:
4343
- ubuntu-toolchain-r-test
4444
- llvm-toolchain-xenial-8
4545
compiler: clang
4646
env: "COMPILER=clang++-8 EXTRA_FLAGS=-DJINJA2CPP_CXX_STANDARD=17 SANITIZE_BUILD=address+undefined"
4747
os: linux
48-
before_install:
48+
before_install:
4949
- "date -u"
5050
- "uname -a"
51-
script:
51+
script:
5252
- "export BUILD_TARGET=\"all\""
5353
- "export CMAKE_OPTS=\"-DCMAKE_VERBOSE_MAKEFILE=OFF\""
5454
- "if [[ \"${COMPILER}\" != \"\" ]]; then export CXX=${COMPILER}; fi"
@@ -59,7 +59,7 @@ script:
5959
- "mkdir -p build && cd build"
6060
- "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"
6161
- "ctest -C $BUILD_CONFIG -V"
62-
after_success:
62+
after_success:
6363
- "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then echo \"Uploading code coverate report\" ; fi"
6464
- "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then lcov --directory . --capture --output-file coverage.info ; fi"
6565
- "if [[ \"${COLLECT_COVERAGE}\" != \"\" ]]; then lcov --remove coverage.info '/usr/*' --output-file coverage.info ; fi"

thirdparty/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ endif ()
1717

1818
function(update_submodule submodule)
1919
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+
)
2224
endfunction()
2325

2426
function(imported_target_alias ALIAS)

0 commit comments

Comments
 (0)