diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-10-20 16:11:48 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-10-20 23:42:11 +0000 |
| commit | a19825b45dad112edfa565369d8d31a36bf47817 (patch) | |
| tree | 09a4a2414dcae3beaedbfb13e09b9fac0c5b943e /README.cmake | |
| parent | f66e45b112cd283698996cc72bc659b9715ff5ef (diff) | |
| download | wireshark-a19825b45dad112edfa565369d8d31a36bf47817.tar.gz | |
CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.
Have FindWSWinLibs check for WIRESHARK_LIB_DIR before WIRESHARK_BASE_DIR
to match the behavior of config.nmake and the Windows buildbots, which
set the former but not the latter.
It looks like the latest GLib DLL contains GThread. Adjust
FindGTHREAD2.cmake accordingly.
Change-Id: I0232b1819eca9ba2c39ae6834daddf65af979d7d
Reviewed-on: https://code.wireshark.org/review/4887
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'README.cmake')
| -rw-r--r-- | README.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/README.cmake b/README.cmake index 2061f8d527..1fa2f7c8a8 100644 --- a/README.cmake +++ b/README.cmake @@ -73,10 +73,14 @@ Note 3: How to do an out of tree build using Visual C++ 2013: [This is advanced alpha and should build all executables except the GTK3 Wireshark for 32-bit.] -1) Follow http://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html +1) Follow https://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html Steps 1-9 -1a) Set WIRESHARK_BASE_DIR=c:\wireshark (the parent directory of the - library directory). +1a) Set the library search path. + If you set WIRESHARK_LIB_DIR, it will be used as the top-level library + directory. + If you set WIRESHARK_BASE_DIR, + %WIRESHARK_BASE_DIR%\wireshark-%WIRESHARK_TARGET_PLATFORM%-libs will + be used as the top-level library directory. 1b) set WIRESHARK_TARGET_PLATFORM=win32 (or win64) 1c) set QT5_BASE_DIR=C:\Qt\5.3\msvc2013_opengl (must match the Qt component path on your system) |