Skip to content

Commit 94d015f

Browse files
committed
[Contributing] Fix CMake flag
1 parent beb7640 commit 94d015f

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Defaults
2-
language: cpp
1+
# Use minimal image as base to avoid overriding environment variables.
2+
language: minimal
33
os: linux
44
dist: xenial
55

@@ -47,7 +47,6 @@ matrix:
4747

4848
- name: "clang-tidy linting"
4949
stage: check
50-
language: minimal
5150
addons:
5251
apt:
5352
sources: ['llvm-toolchain-xenial-7', 'ubuntu-toolchain-r-test']
@@ -65,7 +64,6 @@ matrix:
6564

6665
- name: "cppcheck linting"
6766
stage: check
68-
language: minimal
6967
addons: { apt: { packages: ['cppcheck'] } }
7068
before_script:
7169
- cppcheck --version
@@ -96,7 +94,7 @@ matrix:
9694
- name: "linux build with GCC 8"
9795
stage: test
9896
addons: &gcc8
99-
apt: { sources: ['ubuntu-toolchain-r-test'], packages: ['g++-8', 'lcov', 'python3-setuptools', 'python3-pip'] }
97+
apt: { sources: ['ubuntu-toolchain-r-test'], packages: ['gcc-8', 'g++-8', 'lcov', 'python3-setuptools', 'python3-pip'] }
10098
env: CC=gcc-8 CXX=g++-8
10199
# See https://docs.conan.io/en/latest/integrations/travisci.html
102100
install:
@@ -105,7 +103,7 @@ matrix:
105103

106104
- name: "linux build with GCC 8"
107105
stage: test
108-
addons: { apt: { sources: ['ubuntu-toolchain-r-test'], packages: ['g++-8', 'python3-setuptools', 'python3-pip'] } }
106+
addons: { apt: { sources: ['ubuntu-toolchain-r-test'], packages: ['gcc-8', 'g++-8', 'python3-setuptools', 'python3-pip'] } }
109107
env: CC=gcc-8 CXX=g++-8
110108
install:
111109
- pip3 install conan
@@ -116,6 +114,7 @@ matrix:
116114
- name: "Windows GCC builds"
117115
stage: test
118116
os: windows
117+
language: cpp
119118
compiler: gcc
120119
env:
121120
#- CMAKE_GENERATOR_OVERRIDE="Visual Studio 15 2017 Win64"

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ cmake --build . -j 2
7575
ctest .
7676

7777
# Create coverage
78-
cmake -ENABLE_COVERAGE:BOOL=ON ..
78+
cmake -DENABLE_COVERAGE:BOOL=ON ..
7979
cmake --build . -j 2 -- coverage
8080
```
8181

0 commit comments

Comments
 (0)