diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-08-24 10:56:04 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-08-24 18:06:04 +0000 |
| commit | fbadcdd36b13dbd8889deaaf022f6f5155e0ce6c (patch) | |
| tree | 7f438a87cb1c9f9336e67fa33e96ea0ac25007b9 | |
| parent | 75d9167230350391222dd285ea10fb0a0e30f4bc (diff) | |
| download | wireshark-fbadcdd36b13dbd8889deaaf022f6f5155e0ce6c.tar.gz | |
Add notes about using CMake + Qt Creator.
Change-Id: Ib10cc0a407721d62b39628af858f14e749c94d22
Reviewed-on: https://code.wireshark.org/review/10237
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | README.cmake | 4 | ||||
| -rw-r--r-- | doc/README.qt | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/README.cmake b/README.cmake index e7ed50b669..41edb8ad72 100644 --- a/README.cmake +++ b/README.cmake @@ -60,6 +60,10 @@ Note 1: # Disable building an application bundle (Wireshark.app) on Mac OS X -DENABLE_APPLICATION_BUNDLE=OFF + # Qt Creator expects .cbp files when used with CMake. + -G "CodeBlocks - Unix Makefiles" + -G "CodeBlocks - NMake Makefiles" + Note 2: After running cmake, you can always run "make help" to see a list of all possible make targets. diff --git a/doc/README.qt b/doc/README.qt index 94dd4c4ec3..544ff563b2 100644 --- a/doc/README.qt +++ b/doc/README.qt @@ -21,11 +21,16 @@ There are several ways of building the Qt UI: Open the top-level CMakeLists.txt within Qt Creator. It should ask you to choose a build location. Do so. It should then ask you to run CMake. Fill in - any desired build arguments (e.g. "-D CMAKE_BUILD_TYPE:STRING=Debug" or - "-D ENABLE_GTK3:BOOL=OFF") and click the "Run CMake" button. When that + any desired build arguments (e.g. "-D CMAKE_BUILD_TYPE=Debug" or + "-D ENABLE_GTK3=OFF") and click the "Run CMake" button. When that completes select "Build → Open Build and Run Kit Selector..." and make sure wireshark is selected. + Note that Qt Creator uses output created by the CodeBlocks generator. If + you run CMake outside of Qt Creator you should use the "CodeBlocks - Unix + Makefiles" or "CodeBlocks - NMake Makefiles" generators, otherwise Qt + Creator will prompt you to re-run CMake. + 2) CMake: Qt (BUILD_wireshark) is enabled by default. Use the "cmake" command to |