diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-05-16 20:43:17 +0100 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-08 12:13:35 +0000 |
| commit | 561460160a4ae73bda9b92751ae5c35d4324bb87 (patch) | |
| tree | d3fad10ea806f0feca51e6560768216cdecb3f6e /CMakeOptions.txt | |
| parent | 39cdb98606b821136aabc6d60b2e1ce4846aab8b (diff) | |
Update CMake build for win32 to build QT again, and to find
GLib and GThread libs
Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a
Reviewed-on: https://code.wireshark.org/review/2010
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'CMakeOptions.txt')
| -rw-r--r-- | CMakeOptions.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 2a5969f0c1..9ccba66a6c 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -48,7 +48,12 @@ option(ENABLE_GUIDES "Build Guides" OFF) option(ENABLE_PCAP_NG_DEFAULT "Enable pcap-ng as default file format" ON) option(ENABLE_ADNS "Build with adns support" ON) -option(ENABLE_PORTAUDIO "Build with PortAudio support" ON) +# Temp as Win32 CMake doesn't yet handle building PortAudio +if(WIN32) + option(ENABLE_PORTAUDIO "Build with PortAudio support" OFF) +else() + option(ENABLE_PORTAUDIO "Build with PortAudio support" ON) +endif() option(ENABLE_ZLIB "Build with zlib compression support" ON) option(ENABLE_LUA "Build with Lua dissector support" ON) option(ENABLE_PYTHON "Build with Python dissector support" OFF) @@ -56,14 +61,22 @@ option(ENABLE_SMI "Build with libsmi snmp support" ON) option(ENABLE_GNUTLS "Build with GNU TLS support" ON) option(ENABLE_GCRYPT "Build with GNU crypto support" ON) option(ENABLE_GEOIP "Build with GeoIP support" ON) -option(ENABLE_CAP "Build with Posix capabilities support" ON) +# Because Win32 isn't Posix +if(NOT WIN32) + option(ENABLE_CAP "Build with Posix capabilities support" ON) +endif() option(ENABLE_CARES "Build with c-ares support" ON) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") option(ENABLE_NETLINK "Build with libnl support" ON) endif() # todo Mostly hardcoded option(ENABLE_KERBEROS "Build with Kerberos support" ON) -option(ENABLE_SBC "Build with SBC Codec support in RTP Player" ON) +# Temp as Win32 CMake doesn't yet handle SBC Codec +if(WIN32) + option(ENABLE_SBC "Build with SBC Codec support in RTP Player" OFF) +else() + option(ENABLE_SBC "Build with SBC Codec support in RTP Player" ON) +endif() # How to install set(DUMPCAP_INSTALL_OPTION "normal" CACHE STRING "Permissions to install") set(DUMPCAP_INST_VALS "normal" "suid" "capabilities") |