diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-06-18 21:25:12 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-06-18 19:28:49 +0000 |
| commit | 72078cfc91834f08272e433c66e886686140a20c (patch) | |
| tree | 3450e353f5f4448fe9b97f4383a284d5d1c601c1 /CMakeOptions.txt | |
| parent | ff5c9684db63bba1e9fabcb9725518a4abc63383 (diff) | |
Undo more of Graham's changes:
- We don't expect to find all packages and it is normally OK for
some to fail.
Change-Id: I46c5edbf8ea3635fd703b222d4a9beb5ebb4745a
Reviewed-on: https://code.wireshark.org/review/2406
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'CMakeOptions.txt')
| -rw-r--r-- | CMakeOptions.txt | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 5e9f681b9d..ce0b944719 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -48,34 +48,21 @@ 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) -# 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_PORTAUDIO "Build with PortAudio support" ON) option(ENABLE_ZLIB "Build with zlib compression support" ON) option(ENABLE_LUA "Build with Lua dissector support" ON) 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) -# Because Win32 isn't Posix -if(NOT WIN32) - option(ENABLE_CAP "Build with Posix capabilities support" ON) -endif() +option(ENABLE_CAP "Build with Posix capabilities support" ON) 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) -# 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() +option(ENABLE_SBC "Build with SBC Codec support in RTP Player" ON) # How to install set(DUMPCAP_INSTALL_OPTION "normal" CACHE STRING "Permissions to install") set(DUMPCAP_INST_VALS "normal" "suid" "capabilities") |