Commit Graph

11 Commits

Author SHA1 Message Date
Gerald Combs 8bd80e0191 CMake: Set WIRESHARK_TARGET_PLATFORM.
Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt.  It's used
by a couple of our modules and will be used for NSIS packaging.

Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11
Reviewed-on: https://code.wireshark.org/review/6458
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 22:21:41 +00:00
Gerald Combs a19825b45d 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>
2014-10-20 23:42:11 +00:00
Graham Bloice 561460160a 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>
2014-06-08 12:13:35 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Graham Bloice e36f3b0526 Ensure the WIRESHARK_BASE_DIR env var is in cmake format. Required for the regex in FindGTK3.cmake.
svn path=/trunk/; revision=53550
2013-11-24 19:12:07 +00:00
Jörg Mayer f5fd46fe6d qtshark and wireshark(gtk2) now actually find their libs.
svn path=/trunk/; revision=52539
2013-10-11 11:11:41 +00:00
Jörg Mayer 8719cebf38 Make airpcap detection work
svn path=/trunk/; revision=52535
2013-10-11 07:38:45 +00:00
Jörg Mayer 7c25a38963 lib is required for linking, the dlls are in bin
And with this change, I'm finally able to run the executables in the
top builddir.

svn path=/trunk/; revision=52498
2013-10-10 17:13:02 +00:00
Jörg Mayer 36e0adfcc1 Generate setpath.bat to set the paths necessary for running
the generated binaries inside the build dir.

svn path=/trunk/; revision=52492
2013-10-10 13:37:15 +00:00
Jörg Mayer 21bcd56a69 Fix a typo (a missed replace)
svn path=/trunk/; revision=52234
2013-09-27 22:30:34 +00:00
Jörg Mayer d456079b7e Beginnings of win cmake support (not yet working), created by Graham Bloice,
some smaller changes by me.
- README.cmake
  Document how to (one day) run on Windows
- CMakeLists.txt
  Use MSVC compiler flags for MSVC instead of gcc flags
- FindWSWinLibs.cmake
  New: Creates HINTS for finding includes and libraries
  inside the Wireshark support library installation.
- FindXXX.cmake
  Make use of HINTS generated by FindWSWinLibs.cmake

This has not really been tested on Windows as my installation seems to have
automagically downloaded some fixes and is in an inconsistent state since.
Will probably need to reinstall.

svn path=/trunk/; revision=52194
2013-09-23 21:45:55 +00:00