diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-04-26 23:18:19 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-04-29 04:25:26 +0000 |
| commit | 14017dc6f1638c43afa47611d5aa32513ce36850 (patch) | |
| tree | 1ec7251bc5d6e1c4e8bf150b139fcfe32e1d0e97 | |
| parent | 8d4db3e40b95ef39a34fdcc0b4454bd459606672 (diff) | |
| download | wireshark-14017dc6f1638c43afa47611d5aa32513ce36850.tar.gz | |
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 <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CMakeOptions.txt | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ccf0b8219c..659cfd5952 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -711,7 +711,9 @@ add_subdirectory( ui ) add_subdirectory( wiretap ) add_subdirectory( wsutil ) -add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libfiletap dumpabi-libwiretap dumpabi-libwsutil color.h) +if(NOT WIN32) + add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libfiletap dumpabi-libwiretap dumpabi-libwsutil color.h) +endif() if(ENABLE_ECHLD) add_subdirectory( echld ) 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) |