Commit Graph

64 Commits

Author SHA1 Message Date
Gerald Combs 5c5bf3b370 Update READMEs to reflect recent CMake environment changes.
Change-Id: Idbf879f20448eea0b69e793271439dec877832e9
Reviewed-on: https://code.wireshark.org/review/4602
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 22:05:10 +00:00
Gerald Combs eb14a1f932 WSUG: Convert the ``File I/O'' chapter to AsciiDoc.
Leave most of the content intact for now. Remove images for
no-longer-supported versions of GTK+. Add an example for building the
Guides to README.cmake.

Change-Id: Id9e6a308c91b594d1fb7f107d7b9b28074a92a8b
Reviewed-on: https://code.wireshark.org/review/3931
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01 01:07:08 +00:00
Gerald Combs ab33c4003b More README.cmake updates.
Change-Id: I1c7e51ee397171af0703878e509665c8119b37ba
Reviewed-on: https://code.wireshark.org/review/3841
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-25 16:39:59 +00:00
Gerald Combs bba8edc392 README.cmake: List more cmake options.
Change-Id: I80b5c82f57c4de55aba9c7ee8044f565c9819d7e
Reviewed-on: https://code.wireshark.org/review/3630
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15 23:54:36 +00:00
Guy Harris 3b72a7d976 Add some issues that came up when comparing autotools and CMake compile flags.
Also be consistent about whether OS X is working or not, and note that
we're also doing CMake builds on Solaris.

Change-Id: I2da18d2fb5aec7e5806dc7ea186f729acef94272
Reviewed-on: https://code.wireshark.org/review/3389
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03 20:13:50 +00:00
Guy Harris 2d126cfec1 Add an OSX_DEPLOY_TARGET option to control building for a target OS version.
It should be set to an OS version, such as "10.5" or "10.6" or..., and,
if set (and if you're building for "APPLE"), it'll try to find the SDK
(and fail if it's not found), and add appropriate -isysroot,
-mmacosx-version-min, and, if appropriate, -m32 compiler options.

(It will need more work once we support building OS X app bundles and
installers; pick up more stuff from configure.ac for that.)

Change-Id: I0aebf2db8aa39304a41be4e2a9879dea6f308ec7
Reviewed-on: https://code.wireshark.org/review/3388
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03 20:08:15 +00:00
Gerald Combs f6008e45e3 Update to match the current Windows Buildbot environment.
Update some OS X information as well.

Change-Id: I9a252ec83712848696dbb531e6da15b3c7644591
Reviewed-on: https://code.wireshark.org/review/3327
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-01 17:30:28 +00:00
Guy Harris 43a81b6139 Add some information on running from the build directory.
Change-Id: I6c01141cd02af358152d007175ec0b51357e42b3
Reviewed-on: https://code.wireshark.org/review/3298
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 20:56:29 +00:00
Guy Harris 9505d3a7bc Need to make Windows installer packages as well.
Change-Id: I5e5483ead229ff74fb7bacba72459e324f9bd510
Reviewed-on: https://code.wireshark.org/review/3294
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 18:39:16 +00:00
Guy Harris b98537a4da We need to support building against an SDK on OS X.
Change-Id: I1fe9390e450dcb3669653a94d95339bce3182799
Reviewed-on: https://code.wireshark.org/review/3293
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 18:37:58 +00:00
Guy Harris 8531f88222 Include OS X installer dmgs as a package type we need to support.
Change-Id: I419fa4889d1fc2a9fd12ec19385543bd085e6b1e
Reviewed-on: https://code.wireshark.org/review/3292
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 18:36:29 +00:00
Jeff Morriss 3762440ff1 cmake also needs to learn to build SVR4 packages.
Change-Id: I030e84b9247b273b01890a47d92109dd603e3247
Reviewed-on: https://code.wireshark.org/review/3288
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-31 13:21:32 +00:00
Joerg Mayer b70bb4654a Make it harder to miss that this is also about Win builds
Change-Id: Id4fd7a4672ed32dfcb57a4435a6b3e5cf2e5ca3d
Reviewed-on: https://code.wireshark.org/review/2207
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 07:38:23 +00:00
Balint Reczey a08cbe7071 Use only dpkg-buildpackage for building .debs
This makes .deb generation not depending on autotools and also removes
debian-package target from autotools-generated Makefile.

Change-Id: Ia684cd310d85906763af1035fddf39c1fbaed984
Reviewed-on: https://code.wireshark.org/review/2052
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-09 22:02:06 +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 b0ba475fbf Continue to remove $Id$ from top of file
(Using sed : sed -i '/^  \$Id\$/,+1 d') (No star only 2 spaces before)

Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54
Reviewed-on: https://code.wireshark.org/review/883
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:46:57 +00:00
Jörg Mayer 113c6d5f55 Fix a typo
svn path=/trunk/; revision=54842
2014-01-19 02:18:24 +00:00
Jörg Mayer 6244f2fa32 Finally successfully built with the msvc2010 GUI a Debug
and a RelWithDebInfo build, after adding the missing path
to the cygwin tools.

svn path=/trunk/; revision=53790
2013-12-04 22:07:26 +00:00
Jörg Mayer 55546d5123 On Windows:
- Add instructions how to build zlib
- Add information how to build with msbuild


svn path=/trunk/; revision=53776
2013-12-04 09:10:35 +00:00
Jörg Mayer 20799bdeb4 Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part of
the QT5_BASE_DIR value.

svn path=/trunk/; revision=53717
2013-12-02 09:50:30 +00:00
Jörg Mayer da01960a24 Make FindGTK3 work on windows
svn path=/trunk/; revision=53218
2013-11-10 11:00:54 +00:00
Jörg Mayer 0d23305cd5 cmake builds against gtk3 don't work. Those against gtk2 do.
svn path=/trunk/; revision=53188
2013-11-09 12:20:21 +00:00
Jörg Mayer 7c20a9314f Release notes are done.
svn path=/trunk/; revision=53034
2013-11-01 23:40:11 +00:00
Jeff Morriss 119b431f6a Add some items to the list of things still to be done.
svn path=/trunk/; revision=52952
2013-10-29 15:28:49 +00:00
Jörg Mayer 3af074a3f6 Make pkgconfig work - sort of:
- fix a typo
- Add the library dirs and not just the libraries.
  This would help if the paths that are now returned
  were actually correct.

svn path=/trunk/; revision=52598
2013-10-14 14:53:36 +00:00
Jörg Mayer 3ab8799526 Remove some things that I added while not understanding the real
problem/solution.
"Long" since solved by copying the solution from Makefile.nmake.

Small update to the status of cmake builds on windows

svn path=/trunk/; revision=52574
2013-10-12 22:08:03 +00:00
Jörg Mayer f0e92efd24 The path for the Qt5 installation now needs to be set as a
windows environment variable.

svn path=/trunk/; revision=52540
2013-10-11 11:25:40 +00:00
Jörg Mayer 689618cd85 Build qtshark by default, use qt5 by default. To turn
off building qtshark do "cmake ... -DBUILD_qtshark=OFF ..."
or change your local copy of CMakeOptions.txt

Small update to README.cmake (when running nmake I recommend
using /X- to avoid some (viewing) corruptions.


svn path=/trunk/; revision=52501
2013-10-10 17:28:50 +00:00
Chris Maynard b80fad54e5 Fix a couple of typos.
svn path=/trunk/; revision=52500
2013-10-10 17:23:12 +00:00
Jörg Mayer 607e3297d3 Explain about setpath.bat
svn path=/trunk/; revision=52499
2013-10-10 17:16:21 +00:00
Jörg Mayer 84aebfb9dd Small update wrt the Windows build.
svn path=/trunk/; revision=52429
2013-10-06 23:35:39 +00:00
Graham Bloice d7ab7a8610 Updated instructions for Windows CMake usage when build a Visual Studio solution.
svn path=/trunk/; revision=52375
2013-10-05 08:02:17 +00:00
Jörg Mayer 83d4da3fb6 Document a little progress wrt cmake windows builds.
svn path=/trunk/; revision=52374
2013-10-04 23:46:08 +00:00
Jörg Mayer 9a495ec37e On Win it's nmake, not make
svn path=/trunk/; revision=52201
2013-09-24 16:50:21 +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
Jörg Mayer d266d38af0 Now all disectors requiring asn2wrs can be generated using
cmake.

svn path=/trunk/; revision=49254
2013-05-11 20:52:50 +00:00
Jörg Mayer 540b4d5f2d Generating the realease notes is not yet done.
svn path=/trunk/; revision=49037
2013-04-25 21:34:22 +00:00
Balint Reczey 63d61ede1b Add a few comments to CMake TODO items
svn path=/trunk/; revision=47880
2013-02-25 18:12:28 +00:00
Balint Reczey 3c023a61b7 CMake build works fine on Debian Wheezy
svn path=/trunk/; revision=47847
2013-02-23 22:54:26 +00:00
Balint Reczey daf3d97b5e Note that CMake honors umask for creating directories
svn path=/trunk/; revision=47846
2013-02-23 22:54:17 +00:00
Anders Broman b2633b05d8 From John Bradshaw:
Spelling fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6296

svn path=/trunk/; revision=38834
2011-09-01 04:35:57 +00:00
Jörg Mayer a7f7ada049 cmake stuff:
- Fix fallout from gtk/text_import_scanner.l patch: Wireshark will
  build with cmake again.
- Update README.cmake a bit
- Running "cmake -DUI_MANAGER=ON" will give you the new ui-manager.


svn path=/trunk/; revision=34885
2010-11-15 20:25:28 +00:00
Jörg Mayer eb1fdd0f27 - Reset a few more variables used in FindXYZ scripts.
- README.cmake: small update.
- Set a variable before using it for installation.

svn path=/trunk/; revision=34274
2010-09-28 19:23:15 +00:00
Jörg Mayer 8c5843f14b Small update: add opensuse 11.3 with gcc and gnu make as build-envs
svn path=/trunk/; revision=34236
2010-09-24 13:54:23 +00:00
Jörg Mayer 08619accd1 - Update todo list
- Add dftest and randpkt manpages to sync with autofoo


svn path=/trunk/; revision=33521
2010-07-14 16:16:29 +00:00
Kovarththanan Rajaratnam d62ee4e1c0 Add 32bit Ubuntu 10.04 to supported platforms
svn path=/trunk/; revision=33108
2010-06-06 06:09:26 +00:00
Jörg Mayer 09bbfe21dd - Add tap-sv.c and packet-sv.c to the list of files to build
- Whitespace fixes
- Add Fedora 64 bit to the list of platforms where cmake should
  work

svn path=/trunk/; revision=33073
2010-06-03 13:04:22 +00:00
Jörg Mayer 96779de920 cmake changes:
- Add checking for linker flags
- Install plugins with the name including the Wireshark version.
  This will make it easier to find matching plugin versions if
  files get just copied over.


svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
Jörg Mayer 6de362457d - Derive Wireshark version from configure.in for now.
Allow to overide that version in CMakefile.txt
- Minor update to README.cmake
- Turn off GTK_DEBUG


svn path=/trunk/; revision=32139
2010-03-07 19:40:25 +00:00
Jörg Mayer 9a69a7934e - Beginnings of cmake in docbook directory
- Add note about "make help"
- Move beginnings of packaging into its own file: CPackConfig.txt

svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00