Look for wpcap.lib in WpdPack/Lib/x64 when our target platform is Win64.
Change-Id: I9a1bac22106bcb6a1f155ce83c02e344e6ec0d55
Reviewed-on: https://code.wireshark.org/review/3331
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Note that the cache file (CMakeCache.txt) must be cleared when the
include or library paths change, otherwise the cached result of
CHECK_FUNCTION_EXISTS will be re-used.
Change-Id: Ia18ed4f1b6b162499aeae6e66f612a4945390c2a
Reviewed-on: https://code.wireshark.org/review/3245
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
I have ***NO*** idea why this makes a difference, but, without this
change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly
for wsutil/CMakeLists.txt, and, with this change, it is. I guess
there's something magic involved here with "global" CMake variables or
something crazy such as that.
Change-Id: I7a0046b9c249568cd666720838104f48e854e203
Reviewed-on: https://code.wireshark.org/review/2612
Reviewed-by: Guy Harris <guy@alum.mit.edu>
For -f and -m flags that don't apply to the target architecture(?),
Clang doesn't fail but does print a warning "argument unused during
compilation: '-{flag}'". Catch that and treat it as a failure
indication, so we don't use that flag.
Change-Id: I65948ada41fa44fb62f9a2b8b320f137a5902b8f
Reviewed-on: https://code.wireshark.org/review/2399
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Protecting HAVE_PCAP_CREATE was not enough for the moc run in qt,
maybe it doesn't have _WIN32 set? Don't even try to detect this
function on WIN32 for now.
Change-Id: I0d8a8b5b110cec164f86fe11f26a7add558eee1b
Reviewed-on: https://code.wireshark.org/review/2370
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
of finding the package don't allow the first method to fail terminally.
Todo: Fix this in all other places as well.
Change-Id: I5a343fac33f6a5d6e50ff353d739459b2e36711a
Reviewed-on: https://code.wireshark.org/review/2300
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Fix detection of Homebrew on APPLE
Change-Id: I96506bb57d4772c5c90b1117c37e8350cda376ee
Reviewed-on: https://code.wireshark.org/review/2257
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Not all system have HtmlViewer, but we support that case
by inform user about file/website, so we "have" HtmlViewer.
Change-Id: I46e16a86b5c7f9dd47e1d1ded9d10fd4f565660f
Reviewed-on: https://code.wireshark.org/review/1875
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(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>
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)
Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
SBC Codec can be optionally linked with Wireshark to provide
ability to playing RTP/SBC stream by RTP Player.
Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5
Reviewed-on: https://code.wireshark.org/review/223
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Add developer-guide-docinfo.xml, which lets us carry over DocBook front
matter. Remove the meta_info chapter. Most of its contents are now in
developer-guide-docinfo.xml. Add a DocBook revision history based on
hints from the Git/SVN/CVS revision history.
Comment out or note makefile content that's no longer necessary for
converting the Developer's Guide but will be useful for converting the
User's Guide. Fix building the release notes with CMake. Other minor
changes. Tested with Autotools, nmake, and CMake.
Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a
Reviewed-on: https://code.wireshark.org/review/155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
set(DUMPCAP_INSTALL_OPTION <val>)
where val is one of "normal" "suid" "capabilities"
Some things left to do:
- Error out in cmake if setcap isn't found or libcap isn't found.
- Move multivalue option handling into it's own macro (-file) with
value checking
svn path=/trunk/; revision=54840
Add Windows-style path handling to runlex.sh. Update the example
Chocolatey LEX path accordingly. This lets us use path information in
LEX and have it work in both nmake and runlex.sh
Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it.
The code is currently untested and commented out.
svn path=/trunk/; revision=54828
- Using gtk[23] is a hack. Implement a clean solution.
Me
- In the current setup, building Qt ONLY is not supported as
lots of required support libraries are only found in gtk2 and
gtk3. Print an error in that case.
- Small style changes (lowercasing, whitespace)
svn path=/trunk/; revision=53692
I've now got tshark to build from a VS solution file, had to do some hacks
to get there though, patch files attached for others to peruse, as I'm not
sure if they are the optimal solutions:
3. As mentioned in my previous message, the VS solution chops out every
8192nd byte from the command line passed to make-dissector-reg.py. My
patch (make-reg.patch) gets CMake to write out the required source file
list to a file and modifies the python script to read in the file. The
python changes *should* be backwards compatible.
Me: Small fix to UseMakeDissectorReg.cmake (elseif() -> else())
svn path=/trunk/; revision=53654
dir instead.
- (Finally!) fix the problem of missing admon graphics in out of
tree builds - specify the admin directory as an absolute path
This may need porting to Makefile.am
svn path=/trunk/; revision=53618
While it was an interesting exercise it just doesn't
work good enough to stay, i.e. it doesn't automatically
pick up changes but requires rerunning cmake instead.
svn path=/trunk/; revision=53149
- 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
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
Sort the #cmakedefines in cmakeconfig.h.in to more closely match the
order in config.h.in, to make it easier to make sure CMake and autofoo
are doing the same checks. Remove some #cmakedefines that don't
correspond to check that are being done either by CMake or autofoo.
svn path=/trunk/; revision=52515
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
be incorrect on the first pass and only be correct when remade.
The reason was that disp-exp.cnf was created incorrectly on first pass.
disp-exp.cnf required dop-exp.cnf to build correctly, so add a mechanism
to add dependencies for export files.
Note: Only the cmake change has been tested, the autofoo stuff requires
testing.
svn path=/trunk/; revision=52120
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
and returned variable-names:
Old: Provide the var name and adapt the find-name
New: Provide the find-name and adapt the var name
This allows for different packages with the same var name.
This chage effects Qt4 and PythonInterp.
- Replace self created FindPYTHON with cmake provided
FindPythonLibs.
svn path=/trunk/; revision=49105
find the corresponding libnl-genl or libnl-route libraries, act as if we
didn't find libnl.
If we didn't find libnl version 2 or 3, don't check whether it's version
2 or 3.
svn path=/trunk/; revision=48742
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
- Link dumpcap (and only dumpcap) against gthread
- gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1
- Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..."
svn path=/trunk/; revision=37103
-A patch to fix configure with cmake with macports libs.
(gdk-pixbuf has now its own port. Location of headers has
changed.)
svn path=/trunk/; revision=35429
- 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
http://www.opensync.org/browser/branches/3rd-party-cmake-modules/modules
+ split out FindGMODULE2.cmake
+ contains /sw/... by default
+ supposedly tested on OSX
- Disable pcre for cmake builds by default, gregex should be
picked up automatically if glib2 is not too old.
Should you have trouble linking due to some libgmodule... stuff
undefined, please add "${GMODULE2_LIBRARIES}" after "${GLIB2_LIBRARIES}"
an report back.
svn path=/trunk/; revision=34248
FindZLIB.cmake. What it didn't do was do adapt the magic names
that are derived from the name of the FindXXX.cmake script.
Fix that. Also add $Id$ to the FindZLIB.cmake script.
svn path=/trunk/; revision=32899
- 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
pcap_free_datalinks().
Sort the CMake tests in cmake/modules/FindPCAP.cmake into the same order
as the tests in the autoconf script, and note that, in the autoconf
script, the checks for pcap_open_dead() and pcap_freecode() do more than
just look for the routines in the library.
svn path=/trunk/; revision=32225
with a few hacks right now:
- The tip.png, warning.png and note.png images are missing from the
pdfs and I have no idea how to tell fop how to find them.
- Disabling/enabling building the guides via option currently doesn't
work (probably too many macros :-), so comment out the subdir instead.
- Right now, in order to build the devleopers guide we need to do the
following in the source docbook directory:
touch wsdg_graphics/toolbar/dummy.dummy
Apart from these: The build works with a pristine docbook dir
(svn status --no-ignore).
svn path=/trunk/; revision=32004
http://www.itk.org/Bug/view.php?id=9219
Note that CMAKE_CFG_INTDIR is no longer necessary for this purpose but
has been left for compatibility with existing projects. Instead
add_custom_command() recognizes executable target names in its COMMAND
So just use "lemon" instead of specifying the full path.
svn path=/trunk/; revision=30109
- FindHtmlViewer.cmake: Try to add reading the name of the
html viewer from the HTML_VIEWER environment variable (untested)
svn path=/trunk/; revision=30104
That's what the packages are for, so instead of creating
WSWIN32, the stuff should probably go into the GLIB2
package.
- libwireshark now compiles - no time to add linking with
it until tonight
svn path=/trunk/; revision=29756
It's only beginnings, so epan is commented out in
the subdirs statement.
This is more a synch to avoid duplicate work and creating
conflicting patches to the cmake stuff.
svn path=/trunk/; revision=29666
few mistakes that I made earlier.
Current status: dumpcap still doesn't build
Next step: Add a ylwrap like workaround for flex misbehaviour.
svn path=/trunk/; revision=28518
* modify CMakeInstallDirs.cmake according to cmake developper wishes
* FindDBUSGLIB.cmake fixes
* Add HAVE_CHOWN
* remove DBus from CMakeLists.txt.
* DBus support has its own application (capdbus) and is in a self contained directory. A separate patch will be provided
svn path=/trunk/; revision=23300
Add some more (hackish) tests.
Add a LICENSE file until I find the time to add it to all
files individually.
CMakeLists.txt
Add some addiotional stuff regarding options.
Add (non-working) code to generate config.h
Handle GTK1 vs GTK2 and GLIB1 vs GLIB2
svn path=/trunk/; revision=19168
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