git.samba.org / metze / wireshark / wip.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f66e45b) | patch
CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.
authorGerald Combs <gerald@wireshark.org>
Mon, 20 Oct 2014 23:11:48 +0000 (16:11 -0700)
committerGerald Combs <gerald@wireshark.org>
Mon, 20 Oct 2014 23:42:11 +0000 (23:42 +0000)
commita19825b45dad112edfa565369d8d31a36bf47817
tree09a4a2414dcae3beaedbfb13e09b9fac0c5b943etree
parentf66e45b112cd283698996cc72bc659b9715ff5efcommit | diff
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>
README.cmake diff | blob | history
cmake/modules/FindGTHREAD2.cmake diff | blob | history
cmake/modules/FindWSWinLibs.cmake diff | blob | history
Unnamed repository; edit this file to name it for gitweb.