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 | |
parent | ff5c9684db63bba1e9fabcb9725518a4abc63383 (diff) | |
download | wireshark-72078cfc91834f08272e433c66e886686140a20c.tar.gz |
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>
-rw-r--r-- | CMakeLists.txt | 9 | ||||
-rw-r--r-- | CMakeOptions.txt | 19 |
2 files changed, 6 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 39fbb7306f..215e8084f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,7 +432,7 @@ endif() # - set HAVE_XXX #The minimum package list -set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH PythonInterp) +set(PACKAGELIST Gettext M GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH PythonInterp) set(GLIB2_REQUIRED TRUE) set(GLIB2_FIND_REQUIRED TRUE) set(GLIB2_MIN_VERSION 2.14.0) @@ -440,7 +440,6 @@ set(GTHREAD2_REQUIRED TRUE) set(PythonInterp_FIND_VERSION 2) set(Python_ADDITIONAL_VERSIONS 3) if (NOT WIN32) - set(PACKAGELIST ${PACKAGELIST} Gettext M) set(M_REQUIRED TRUE) endif() @@ -475,7 +474,7 @@ if(BUILD_qtshark) set( QT5_BASE_PATH "$ENV{QT5_BASE_DIR}" ) set( CMAKE_PREFIX_PATH "${QT5_BASE_PATH}" ) # Used for the creation of setpath.bat - set( QT5_DLL_PATH "${QT5_BASE_PATH}\\bin" ) + set( QT5_DLL_PATH "${QT5_BASE_PATH}/bin" ) set( WS_ALL_LIBS ${WS_ALL_LIBS} ${QT5_DLL_PATH} ) endif() set(PACKAGELIST ${PACKAGELIST} Qt5Widgets Qt5PrintSupport Qt5LinguistTools) @@ -551,9 +550,7 @@ if(ENABLE_CAP) set(PACKAGELIST ${PACKAGELIST} CAP SETCAP) endif() -if (NOT WIN32) - set(PACKAGELIST ${PACKAGELIST} YAPP) -endif() +set(PACKAGELIST ${PACKAGELIST} YAPP) set(PACKAGELIST ${PACKAGELIST} POD) 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") |