path: root/README.cmake
diff options
authorGraham Bloice <graham.bloice@trihedral.com>2014-05-16 20:43:17 +0100
committerEvan Huus <eapache@gmail.com>2014-06-08 12:13:35 +0000
commit561460160a4ae73bda9b92751ae5c35d4324bb87 (patch)
treed3fad10ea806f0feca51e6560768216cdecb3f6e /README.cmake
parent39cdb98606b821136aabc6d60b2e1ce4846aab8b (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 'README.cmake')
1 files changed, 3 insertions, 1 deletions
diff --git a/README.cmake b/README.cmake
index 8919412b69..c0ecbfc81e 100644
--- a/README.cmake
+++ b/README.cmake
@@ -73,9 +73,11 @@ How to do out of tree build (Win32/64):
5) cmake -G "NMake Makefiles" 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)
+5b) cmake -G "Visual Studio xx" where xx = 10 for VS2010, 11 for VS2012 and 12 for VS2013
+ will build a solution for a specfic version of VS (it must still be installed).
6) nmake /X- VERBOSE=1 (or cmake --build . -- VERBOSE=1 )
6a) Wireshark.sln (this will run up Visual Studio with the cmake built solution
- (or use msbuild: cmake --build . -- /p:Configuration=RelWithDebInfo)
+ (or using msbuild: msbuild wireshark.sln /m /p:Configuration=RelWithDebInfo)
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
run whether it is necessary or not).