diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-10-18 10:16:39 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2016-10-19 20:35:31 +0000 |
| commit | d3995b5248e412dd1b00c06a3f54936326967e2d (patch) | |
| tree | d4098395b21258ce4dc564916a364f3a4ba93496 /.travis.yml | |
| parent | 5ab49c623df23a5d19cffdc29f912dd1d2798ca9 (diff) | |
| download | wireshark-d3995b5248e412dd1b00c06a3f54936326967e2d.tar.gz | |
Disable GTK+ by default.
I suggested disabling GTK+ by default at Sharkfest EU and no one
objected, hence this patch.
Disable it by default in both Autotools and CMake. Make sure it's
enabled for Debian packaging. The RPM packaging enables GTK3 explicitly
so no change appears to be necessary there.
Change-Id: If5daeaef4bb26cf60006bc8883be15b2cf6c6ae4
Reviewed-on: https://code.wireshark.org/review/18256
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 1a1f8ca59a..8c1ce4917d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ compiler: env: - BUILD_CMAKE=no - BUILD_CMAKE=yes + - CMAKE_GTK_OPTS="-DBUILD_wireshark_gtk=ON" + - AUTOTOOLS_GTK_OPTS="--with-gtk=3" matrix: exclude: @@ -35,6 +37,6 @@ before_install: # - sudo apt-get -qq install qt5-default qttools5-dev qttools5-dev-tools - $CC --version before_script: - if [ ${BUILD_CMAKE} == "yes" ]; then mkdir build && cd build && cmake ..; else ./autogen.sh && ./configure ; fi + if [ ${BUILD_CMAKE} == "yes" ]; then mkdir build && cd build && cmake ${CMAKE_GTK_OPTS} ..; else ./autogen.sh && ./configure ${AUTOTOOLS_GTK_OPTS} ; fi script: - make |