aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2014-08-12Remove a bogus make-dissector-reg dependency from UseMakeDissectorReg.cmakeРоман Донченко1-1/+0
The shell script is not used in the CMake build system. Change-Id: I97d3d750f2521c626594200da8fc9a4453414576 Reviewed-on: https://code.wireshark.org/review/3530 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-07Win flex-bison and Chocolatey updates.Gerald Combs3-25/+12
Chocolatey's latest winflexbison package is usable. Update config.nmake, FindLEX.cmake, and FindYACC.cmake accordingly. Rename CHOCOLATEY_INSTALL_PATH to CHOCOLATEY_BIN_PATH since that's what we're finding. Change-Id: I39973fba0531b3f7a1315ca010a8bd70581db3fb Reviewed-on: https://code.wireshark.org/review/3479 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-01Fix comparison.Gerald Combs1-1/+1
Change-Id: If2af35c8a49f405bee70eb144e26e539a7dc61f2 Reviewed-on: https://code.wireshark.org/review/3335 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-01Fix the CMake WinPcap library path check.Gerald Combs1-1/+7
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>
2014-07-30Add libgpg-error6-0 to the GCRYPT_ERROR_LIBRARY search list.Gerald Combs1-1/+1
(Does FIND_LIBRARY support wildcards?) Change-Id: I240e93070091e445446478b082ad284267c977a6 Reviewed-on: https://code.wireshark.org/review/3272 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Fix cmake build for portaudio V18Peter Wu1-1/+17
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>
2014-07-12Remove some $Id$ linesJoerg Mayer1-2/+0
Change-Id: Idec3769750f5a433b184e6e9fb44cbad23a29c60 Reviewed-on: https://code.wireshark.org/review/3023 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-10Fix a small typo in the FindChocolatey.cmake moduleGraham Bloice1-1/+1
Change-Id: Idefea86a9f65f59432db4bf32b9f702298409cdb Reviewed-on: https://code.wireshark.org/review/2980 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-09Cmake : (Find XLST Proc) fix indent (use 4spaces)Alexis La Goutte1-47/+47
Change-Id: Ic8abdc9aaae899dcc5d870bc023c52dc7a2bbfe6 Reviewed-on: https://code.wireshark.org/review/2952 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24Fix OS X CMake build.Guy Harris1-0/+21
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>
2014-06-18Another message from Clang for unknown -f and -m flags.Guy Harris1-0/+1
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>
2014-06-18Don't put c-comments into cmake files. Won't work at midnight either.Joerg Mayer1-2/+2
Change-Id: I80efce78a044f477af56f82cc9d8e85c8544ffbc Reviewed-on: https://code.wireshark.org/review/2372 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18Fix building uiqt on Windows with the cmake build system:Joerg Mayer1-1/+5
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>
2014-06-17It's so simple: If we require a package but provide alternative methodsJoerg Mayer2-15/+10
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>
2014-06-16Undo Graham's change to find the "correct" fixJoerg Mayer1-6/+6
Change-Id: Ifc368687da972231298ab5935d071a84edd3e56e Reviewed-on: https://code.wireshark.org/review/2261 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16Undo Graham's change to move find-package down.Joerg Mayer1-10/+15
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>
2014-06-16Detecting gmodule2 on Homebrew almost worked... it behaves more likeJoerg Mayer1-4/+9
non-apple platforms Change-Id: I1acf8d05c918121fe1a76c8fbd3ac119f624ee8b Reviewed-on: https://code.wireshark.org/review/2256 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-08Update CMake build for win32 to build QT again, and to findGraham Bloice3-16/+25
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-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin2-4/+4
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-04Fix message about detection of asciidoc package (would always reportJoerg Mayer1-2/+2
not found before). Change-Id: Iaac974e5db3e605e0b9f7256d2724ae777eaebc3 Reviewed-on: https://code.wireshark.org/review/1963 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-30cmake: Not all system have HtmlViewerMichal Labedzki1-0/+5
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>
2014-05-27CMake: Remove FeatureSummary.cmake and fix display of featureAlexis La Goutte1-78/+0
Bug:8819 Change-Id: I35778a4ce198245fbe86eaded2b733745ff8e934 Reviewed-on: https://code.wireshark.org/review/1728 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte43-86/+0
(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-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(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>
2014-03-16Fix GTK3 detection (or more specific: the include paths) on WindowsJoerg Mayer1-2/+2
Change-Id: Ia0aef096849d1935ca4a6d1d31aabd099087cf29 Reviewed-on: https://code.wireshark.org/review/694 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte3-6/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-17Add Bluetooth SBC Codec support in cmakeMichal Labedzki1-0/+35
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>
2014-02-11Finish converting the Developer's Guide to AsciiDoc.Gerald Combs1-3/+6
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>
2014-01-25Try to get CMake to build the Developer Guide again. I don't haveGerald Combs1-40/+0
dblatex installed so the release notes fail to build but the WSDG targets appear to work. svn path=/trunk/; revision=54952
2014-01-24Prepare for conversion of Guide chapters to AsciiDoc.Gerald Combs1-0/+39
svn path=/trunk/; revision=54936
2014-01-19Add option to specify special permissions for dumpcap during cmake phase:Jörg Mayer1-0/+21
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
2014-01-16Look for win_flex and win_bison.Gerald Combs2-0/+2
svn path=/trunk/; revision=54830
2014-01-16More Chocolatey lex/yacc updates.Gerald Combs3-0/+52
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
2013-12-22Beginnings of doxygen support.Jörg Mayer1-0/+42
Currently the doxygen.cfg files are not designed for out-of-tree builds - that needs to be fixed first. svn path=/trunk/; revision=54348
2013-12-05Only try to fix absolute Unix paths.Jörg Mayer1-3/+3
svn path=/trunk/; revision=53801
2013-12-01The changes to work around the msbuild deficiencies brokeJörg Mayer1-2/+4
dependeny tracking (replaced the list of dissectors by the file containing the dissectors). Fix that. svn path=/trunk/; revision=53703
2013-12-01Too litte modify in copy - modify - paste cycleJörg Mayer1-2/+2
svn path=/trunk/; revision=53693
2013-12-01Graham BloiceJörg Mayer3-49/+73
- 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
2013-11-29Graham BloiceJörg Mayer1-2/+13
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
2013-11-27- Avoid copying of the graphics, specify the graphics sourceJörg Mayer1-18/+16
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
2013-11-24Ensure the WIRESHARK_BASE_DIR env var is in cmake format. Required for the ↵Graham Bloice1-1/+1
regex in FindGTK3.cmake. svn path=/trunk/; revision=53550
2013-11-18Beginnings of CheckAPI support. More diligence neededJörg Mayer1-0/+18
(need to seperate generated files into their own variables). svn path=/trunk/; revision=53407
2013-11-10On Windows find the standard html viewer by using bigger and biggerJörg Mayer1-9/+22
hammers only to realize that this really needs to be done at runtime. Commit it anyway. svn path=/trunk/; revision=53226
2013-11-10Make FindGTK3 work on windowsJörg Mayer1-20/+46
svn path=/trunk/; revision=53218
2013-11-10Try to get findhtmlviewer working on windows. Doesn't work butJörg Mayer1-0/+2
at least remember the registry keys for the next time someone works on this. svn path=/trunk/; revision=53215
2013-11-07Remove extraction of cmake parameters from autotools files.Jörg Mayer1-53/+0
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
2013-11-03Pass the name of the sed executable as an explicit argurment toJörg Mayer1-1/+1
runlex.sh (like it is done with LEX already). May fix a problem on Windows with cmake. svn path=/trunk/; revision=53059
2013-11-01Add generation of release notes.Jörg Mayer1-0/+107
Regenerate NEWS file svn path=/trunk/; revision=53014
2013-11-01Remove a comment about adding use of the sh version of the script.Jörg Mayer1-13/+0
svn path=/trunk/; revision=53013
2013-11-01Fix a typo that was never noticedJörg Mayer1-4/+4
svn path=/trunk/; revision=53012
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 17:25:56 +0000