diff options
| -rw-r--r-- | CMakeOptions.txt | 4 | ||||
| -rw-r--r-- | README.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 17a6c146eb..c216d1e83e 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -3,7 +3,7 @@ # $Id$ option(BUILD_wireshark "Build the GTK+-GUI version of Wireshark" ON) -option(BUILD_qtshark "Build the Qt-GUI version of Wireshark" OFF) +option(BUILD_qtshark "Build the Qt-GUI version of Wireshark" ON) option(BUILD_tshark "Build tshark" ON) option(BUILD_rawshark "Build rawshark" ON) option(BUILD_dumpcap "Build dumpcap" ON) @@ -20,7 +20,7 @@ option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) option(DISABLE_WERROR "Do not treat Warnings as errors" OFF) option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC (disables -Werror)" OFF) option(ENABLE_GTK3 "Use GTK3 instead of GTK2 to build wireshark" ON) -option(ENABLE_QT5 "Use Qt5 instead of Qt4 to build qtshark" OFF) +option(ENABLE_QT5 "Use Qt5 instead of Qt4 to build qtshark" ON) option(ENABLE_PCAP "Enable libpcap support (required for capturing)" ON) # # Do not make this the default on UN*X; AirPcap support is available diff --git a/README.cmake b/README.cmake index ace783a53a..7019938d9a 100644 --- a/README.cmake +++ b/README.cmake @@ -69,7 +69,7 @@ How to do out of tree build (Win32/64): 5) cmake -G "NMake Makefiles" -DBUILD_wireshark=OFF path\to\sources (i.e. in case your sources are located at c:\wireshark\trunk, use "..\trunk") 5a) cmake path\to\sources (this will build for the latest Visual Studio version found) -6) nmake VERBOSE=1 (or cmake --build . -- VERBOSE=1 ) +6) nmake /X- VERBOSE=1 (or cmake --build . -- VERBOSE=1 ) 6a) Wireshark.sln (this will run up Visual Studio with the cmake built solution 7) In case you want to test the executable(s) inside the build tree: Run setpath.bat whenever it gets updated (there is a message in each cmake |