Commit Graph

8 Commits

Author SHA1 Message Date
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
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 6f872b0e17 Attempted fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8619
When there are several versions of lua installed, try to pick the library
version that matches the include file(s) we selected.

svn path=/trunk/; revision=49164
2013-05-04 23:06:15 +00:00
Jörg Mayer 10bd5631e4 Print the version of the include files that will be used.
svn path=/trunk/; revision=49106
2013-05-01 10:34:15 +00:00
Evan Huus 5e4108c347 Have CMake also consider the include path "lua5.2" (note the dot),
since that is where it can be found on recent Ubuntus, and without it
you get a mix of 5.1 includes and 5.2 libraries, which breaks the build.

svn path=/trunk/; revision=44669
2012-08-25 19:12:03 +00:00
Jörg Mayer f41c0b67d1 Try to detect Lua 5.2 as well
svn path=/trunk/; revision=43307
2012-06-17 12:08:42 +00:00
Jörg Mayer 878d7246b8 - Add $Id: $ tags
- FindHtmlViewer.cmake: Try to add reading the name of the
  html viewer from the HTML_VIEWER environment variable (untested)

svn path=/trunk/; revision=30104
2009-09-23 19:40:25 +00:00
Jörg Mayer ca6b1e2b21 CMAKE: Get most of of missing *build* pieces into place
svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00