From 14017dc6f1638c43afa47611d5aa32513ce36850 Mon Sep 17 00:00:00 2001 From: Graham Bloice Date: Sat, 26 Apr 2014 23:18:19 +0100 Subject: Set CMake defaults for Windows build to: Use GTK2 as per nmake. Not to build the dumpabi executables. Change-Id: Ia28cf1a80b81e10595f4af5bbd46da3b3675faf5 Reviewed-on: https://code.wireshark.org/review/1376 Reviewed-by: Graham Bloice Tested-by: Graham Bloice Reviewed-by: Anders Broman --- CMakeOptions.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'CMakeOptions.txt') diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 893ce0be89..7895348671 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -18,7 +18,14 @@ option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) option(DISABLE_WERROR "Do not treat warnings as errors" OFF) option(ENABLE_EXTRA_COMPILER_WARNINGS "Do additional compiler warnings (disables -Werror)" OFF) -option(ENABLE_GTK3 "Use GTK3 instead of GTK2 to build wireshark" ON) +# +# Leave GTK2 the default on Windows, looks better than GTK3 +# +if(WIN32) + option(ENABLE_GTK3 "Use GTK3 instead of GTK2 to build wireshark" OFF) +else() + option(ENABLE_GTK3 "Use GTK3 instead of GTK2 to build wireshark" ON) +endif() option(ENABLE_QT5 "Use Qt5 instead of Qt4 to build qtshark" ON) option(ENABLE_PCAP "Enable libpcap support (required for capturing)" ON) option(WANT_PACKET_EDITOR "Enable packet editor (experimental)" ON) -- cgit v1.2.3