Commit Graph

48 Commits

Author SHA1 Message Date
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
Jörg Mayer 9ee31d1d0e cmake will now honor -Werror if configured (default: on)
svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
Jörg Mayer 6a8552ff21 The disables features problem was fixed by previous commit.
svn path=/trunk/; revision=30564
2009-10-15 21:26:59 +00:00
Kovarththanan Rajaratnam d2ad010892 * Update list of supported platforms
* Create and assign new task

svn path=/trunk/; revision=30444
2009-10-09 20:14:56 +00:00
Jörg Mayer 1253eb7d5e Add a few more points to the todo list
svn path=/trunk/; revision=30217
2009-09-30 14:06:11 +00:00
Jörg Mayer 6a2f689235 Fix build of make and asn1 plugins.
svn path=/trunk/; revision=30144
2009-09-25 15:17:45 +00:00
Jörg Mayer f69d1f84b8 - Previous patch moved the intall targes dirs too far down.
- Install some auxiliary files (AUTHORS-SHORT, manuf, ...)

svn path=/trunk/; revision=30135
2009-09-25 02:50:48 +00:00
Jörg Mayer 490c1505aa Add a few hints for OS X builds.
svn path=/trunk/; revision=30105
2009-09-23 19:41:08 +00:00
Jörg Mayer ebfcf3c387 Build more plugins with cmake.
svn path=/trunk/; revision=30084
2009-09-23 04:41:14 +00:00
Jörg Mayer 7eed375f9d Make building with GeoIP, Python, Capabilities and c-ares
actually work.

svn path=/trunk/; revision=29870
2009-09-12 17:20:08 +00:00
Jörg Mayer 3a100b0cd8 - Update README.cmake: The stuff now build without
running autofoo first.
- Add a comment how to change the name of a generated target

svn path=/trunk/; revision=29858
2009-09-11 13:30:01 +00:00
Jörg Mayer f1956abf01 Add cmake-modules URL
svn path=/trunk/; revision=19167
2006-09-06 22:14:20 +00:00
Jörg Mayer 903fd2f02c Add some links for further reading
svn path=/trunk/; revision=19151
2006-09-05 12:04:46 +00:00
Jörg Mayer 9f4f88e84e propset, add $Id: $ and copyright headers
svn path=/trunk/; revision=19150
2006-09-05 09:50:45 +00:00
Jörg Mayer 57656db02e OK, as I haven't had any negative feedback, I'm adding my work
to use cmake as a build system. It's in no way complete, I'd
just like others to be able to participate in playing with cmake
and to document what I'm doing.

Please read the README.cmake for what can be done right now.

svn path=/trunk/; revision=19149
2006-09-05 09:27:22 +00:00