diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-09-09 06:40:05 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-09-09 06:40:05 -0500 |
| commit | 2728a86590a5b82152b497a991613b2f48657995 (patch) | |
| tree | d50d2fec7ba1dd42730667a765b7e7fb06f80eba | |
| parent | 5de4c4f0eb9bdcc1dbdadc4aafb4cc89083835a0 (diff) | |
| download | portable-2728a86590a5b82152b497a991613b2f48657995.tar.gz portable-2728a86590a5b82152b497a991613b2f48657995.tar.bz2 portable-2728a86590a5b82152b497a991613b2f48657995.zip | |
travis' cmake does not support ninja, use make
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | scripts/travis | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 1a767b3..1aaab8a 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -27,4 +27,3 @@ addons: | |||
| 27 | apt: | 27 | apt: |
| 28 | packages: | 28 | packages: |
| 29 | - cmake | 29 | - cmake |
| 30 | - ninja-build | ||
diff --git a/scripts/travis b/scripts/travis index 82375cf..58a1dfb 100755 --- a/scripts/travis +++ b/scripts/travis | |||
| @@ -21,8 +21,8 @@ if [ "x$ARCH" = "xnative" ]; then | |||
| 21 | # test cmake and ninja | 21 | # test cmake and ninja |
| 22 | mkdir build | 22 | mkdir build |
| 23 | cd build | 23 | cd build |
| 24 | cmake -GNinja .. | 24 | cmake .. |
| 25 | ninja | 25 | make |
| 26 | else | 26 | else |
| 27 | CPU=i686 | 27 | CPU=i686 |
| 28 | if [ "x$ARCH" = "xmingw64" ]; then | 28 | if [ "x$ARCH" = "xmingw64" ]; then |