8000 Travis: Assume CMake is installed · joglosemarduino/ArduinoJson@27c08b7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 27c08b7

Browse files
bblanchonbblanchon
committed
Travis: Assume CMake is installed
1 parent 77f38e4 commit 27c08b7

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

‎scripts/travis/cmake.sh

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
#!/bin/sh -ex
22

3-
if [ "$(uname)" = 'Darwin' ]; then
4-
URL=https://cmake.org/files/v3.4/cmake-3.4.3-Darwin-x86_64.tar.gz
5-
CMAKE=/tmp/CMake.app/Contents/bin/cmake
6-
CTEST=/tmp/CMake.app/Contents/bin/ctest
7-
else
8-
URL=https://cmake.org/files/v3.4/cmake-3.4.3-Linux-x86_64.tar.gz
9-
CMAKE=/tmp/bin/cmake
10-
CTEST=/tmp/bin/ctest
11-
fi
12-
curl -sS $URL | tar xz -C /tmp --strip 1
13-
143
if [ -n "$GCC" ]; then
154
export CC="gcc-$GCC"
165
export CXX="g++-$GCC"
@@ -28,6 +17,6 @@ else
2817
BUILD_TYPE="Release"
2918
fi
3019

31-
$CMAKE -DCMAKE_BUILD_TYPE=$BUILD_TYPE .
32-
$CMAKE --build .
33-
$CTEST --output-on-failure .
20+
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .
21+
cmake --build .
22+
ctest --output-on-failure .

‎scripts/travis/coverage.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/bin/sh -eux
22

3-
curl https://cmake.org/files/v3.4/cmake-3.4.0-Linux-x86_64.tar.gz | tar xz -C /tmp --strip 1
4-
5-
/tmp/bin/cmake -DCOVERAGE=true .
3+
cmake -DCOVERAGE=true .
64
make
75
make test
86

0 commit comments

Comments
 (0)
0