diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-05-03 17:24:10 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2018-05-04 08:30:07 +0000 |
| commit | 12613415ef0ffb41e36863dfca42c5e71297e330 (patch) | |
| tree | fb339741cc4977effa4cc1a0b214b568039a2fe4 | |
| parent | ae6afe416b07771234334334eecb0feadaaab52f (diff) | |
travis: use ninja for building.
Change-Id: I18cf4c79e6073955d8224c7a37f906ec54a8edbc
Reviewed-on: https://code.wireshark.org/review/27324
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | tools/macos-setup-brew.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 7cbed6d65b..7dfaa67a11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,6 @@ before_script: - sudo gem install asciidoctor - mkdir build - cd build - - cmake ${CMAKE_OPTS} .. + - cmake -GNinja ${CMAKE_OPTS} .. script: - - make + - ninja diff --git a/tools/macos-setup-brew.sh b/tools/macos-setup-brew.sh index 41bf694c39..db980948be 100755 --- a/tools/macos-setup-brew.sh +++ b/tools/macos-setup-brew.sh @@ -13,7 +13,7 @@ brew update #install some libs needed by Wireshark -brew install c-ares glib libgcrypt gnutls lua cmake nghttp2 snappy lz4 libxml2 json-glib +brew install c-ares glib libgcrypt gnutls lua cmake nghttp2 snappy lz4 libxml2 json-glib ninja #install Qt5 brew install qt5 |