aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2015-04-14CMake: Initial PortableApps targets.Gerald Combs1-0/+26
Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14Start moving win-setup to PowerShell.Gerald Combs1-1/+4
Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-26CMake updates for Windows buildGraham Bloice1-41/+0
Removed the redundant setpath batch file and associated macro and updated docs. Change-Id: I5ddab6bad2d14ed3443194d7269f1890e4aa608e Reviewed-on: https://code.wireshark.org/review/7826 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-26CMake cleanup for VS solutionGraham Bloice1-1/+1
Add FOLDER properties to targets to tidy up the VS solution Change-Id: Ia42e0e89fb490cd3dcd33b7c5f59eb0a27b74c7a Reviewed-on: https://code.wireshark.org/review/7822 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-25FindPOD: fix link to CSSPeter Wu1-1/+1
docbook/Makefile.am uses --stylesheet=ws.css too, without this change the generated HTML will point to the source directory... Change-Id: I351cb658c404a08655201933158f91765f8d9c35 Reviewed-on: https://code.wireshark.org/review/7503 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-25Always use html2text.py for FAQ, improve outputPeter Wu1-19/+1
A recent commit broke compilation with Python 3. The original author of html2text.py is deceased and the fork has increased the number of files for this "simple" helper. The html2text.py script in this patch was rewritten and its output matches with lynx (except for a few newlines around lists). This means that indentation has been added for headings, paragraphs and lists. Also, since it was written from scratch, a new license could be chosen that matches Wireshark. Since now the in-tree html2text.py script provides nicer output, remove detection of the alternative programs (elinks, links). lynx/w3m is somehow still necessary for asciidoc though. (I also looked into reusing html2text.py for the release notes to replace asciidoc, but the --format=html output produces different output (HTML adds a ToC and section numbers). For now still require lynx for release notes) Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch Linux x86_64. Test: # For each $PATH per python version, execute (with varying LC_ALL) help/faq.py -b | tools/html2text.py /dev/stdin | md5sum help/faq.py -b | tools/html2text.py | md5sum help/faq.py -b | tools/html2text.py help/faq.py -b | tools/html2text.py >/dev/null Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd Reviewed-on: https://code.wireshark.org/review/7779 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25Have a #define for whether the capture buffer size can be set.Guy Harris1-1/+12
It can be set if either 1) this is Windows (where we're assumed to be using WinPcap, which includes calls to set the buffer size) or 2) we have pcap_create() (in which case we also have pcap_set_buffer_size(), at least in a normal libpcap release). Use that rather than testing "defined(_WIN32) || defined(HAVE_PCAP_CREATE)"; that makes it a bit more obvious what's being tested. Change-Id: Id9f8455019d19206b04dd6820a748cb97ae5ad12 Reviewed-on: https://code.wireshark.org/review/7816 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-12CMake: Add a top-level nsis_package target.Gerald Combs2-0/+16
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07Fix the exec call and paths in the test wrapper.Gerald Combs1-4/+27
Change-Id: Ie36e9c7dc9a60715248aea300cffde8040cb0768 Reviewed-on: https://code.wireshark.org/review/7574 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07Try adding "set -o igncr".Gerald Combs1-0/+3
Maybe the test wrapper should be a Python script. Change-Id: I38a5089c83ef643fb6c7c76acd599cef6aba39f4 Reviewed-on: https://code.wireshark.org/review/7572 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07CMake: Generate a wrapper for test.sh.Gerald Combs1-0/+17
Create a wrapper script that cd's to the test directory and execs test.sh. We need to handle build configurations so the path is a bit roundabout. Change-Id: I4c2a48c041bce2479422830110b1251b3f2c5a94 Reviewed-on: https://code.wireshark.org/review/7570 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-20CMake: Set an output directory for plugins.Gerald Combs1-0/+61
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18CMake: Copy data files to the run directory.Gerald Combs1-0/+27
Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-14CMake: Look for FOP and HHC only when needed.Gerald Combs1-24/+30
FOP is only required for generating PDF output and HHC is only needed for CHM output. Don't look for them unconditionally. Change-Id: I7bec7d061c9e9e8b99431cab873e8c719469552c Reviewed-on: https://code.wireshark.org/review/6539 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-14CMake: Copy wireshark-gtk dependent DLLs to the target directory.Gerald Combs2-2/+98
Add a "copy_gtk_dlls" target similar to "copy_cli_dlls". Change-Id: Id1df1d0ec00c46fccec90c4b8c0c8a2d2a14766a Reviewed-on: https://code.wireshark.org/review/6527 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-13CMake: Copy libwireshark dependent DLLs to the target directory.Gerald Combs12-30/+235
Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-13Fix ASCIIDOC detection broken by commit ae2888aeb2b418c9f62Jörg Mayer1-1/+1
Change-Id: I36cd42a9040e8f8ab2b11ff4211a1298663909a2 Reviewed-on: https://code.wireshark.org/review/6512 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-11Revert "Lemon: Update lemon tools"Pascal Quantin1-1/+1
This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751. This Lemon update fails to compile on OSX and triggers asserts on other platforms Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91 Reviewed-on: https://code.wireshark.org/review/6496 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11Lemon: Update lemon toolsAlexis La Goutte1-1/+1
Fix warning: declaration shadows a variable in the global scope [-Wshadow] Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d Reviewed-on: https://code.wireshark.org/review/3976 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-11CMake: Try to fix Cygwin a2x discovery.Gerald Combs1-9/+13
Change-Id: I46ddd10ab533ff7114aa6a4241a9a261da19329c Reviewed-on: https://code.wireshark.org/review/6487 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-11Update CMake "Project names" and FoldersGraham Bloice2-0/+2
This gives a more structured layout in Visual Studio Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2 Reviewed-on: https://code.wireshark.org/review/6485 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-09CMake: Copy admonition graphics to the correct directory.Gerald Combs1-2/+1
Change-Id: Iecba4000c487a90efedfc7547771539c3748a7f0 Reviewed-on: https://code.wireshark.org/review/6454 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09CMake: Set WIRESHARK_TARGET_PLATFORM.Gerald Combs2-3/+2
Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used by a couple of our modules and will be used for NSIS packaging. Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 Reviewed-on: https://code.wireshark.org/review/6458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09CMake: Copy CHM graphics from the correct source.Gerald Combs1-2/+3
Change-Id: Iea67bdaf8d83009c808bd39693fe273b3181ff76 Reviewed-on: https://code.wireshark.org/review/6452 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09CMake: Migrate to hhc.cmake.Gerald Combs3-30/+11
Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the hhc.cmd wrapper. Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09CMake: Cygwin-ify the xmllint path as well.Gerald Combs1-21/+46
Change-Id: I5e62ed6baeed3fcb76cdffd30666ad01713acd2a Reviewed-on: https://code.wireshark.org/review/6439 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09Add a possible replacement for the cmd hack to work around hhc.exeJoerg Mayer1-0/+9
returning non-null on success. To be invoked via "cmake -P hhc.cmake <single-arg>". Change-Id: Ib2584379c512cbd7f437f36ef932b372fe02203a Reviewed-on: https://code.wireshark.org/review/6440 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09CMake: Try to fix the xsltproc path.Gerald Combs1-17/+27
Try to make the xsltproc path compatible with Cygwin. This is a blind attempt to fix the Windows 8 buildbot. It works fine locally. Change-Id: Ib9d55dd07c6b17cfddf313716227d347109d2103 Reviewed-on: https://code.wireshark.org/review/6438 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09Fix CMake Warning "Argument not separated from preceding token by whitespace."Joerg Mayer1-1/+1
Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2 Reviewed-on: https://code.wireshark.org/review/6437 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09Use the FindHTMLHelp.cmake provided by cmake to find the hhc.Joerg Mayer1-11/+7
Lower case some function/macro calls. Change-Id: I57532e3b4701963b88a536a7ecfe7dfaf4be3d4c Reviewed-on: https://code.wireshark.org/review/6436 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09HTML Help: Fix titles.Gerald Combs1-1/+8
AsciiDoc converts single quotes into curly quote entities, which HTML Help doesn't support. Use sed to fixup the title string. We might want to drop HTML Help at some point. Change-Id: I0c7d3be90c0de7dbac0f1367cc6ba323c7380939 Reviewed-on: https://code.wireshark.org/review/6435 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09CMake: Revert the release notes xsltproc command.Gerald Combs1-1/+3
Should fix the release_notes_txt target. Change-Id: Ie930c49ad34ad70070b8f7d28d79bee55f263c40 Reviewed-on: https://code.wireshark.org/review/6434 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-08CMake: Enable DocBook on Windows.Gerald Combs4-38/+202
Add a wrapper script and CMake macros which lets us run Cygwin's a2x from Windows. Add *another* wrapper script that ignores the return value of hhc.exe. Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake. Add hints to FindFOP.cmake. Use unique file names in the HTML Help chain in an attempt to avoid a race condition. To do: - Fix curly quote in HHC title. Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d Reviewed-on: https://code.wireshark.org/review/6379 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-04No *pcap should have pcap_open() without the other remote extensions.Guy Harris1-3/+1
WinPcap 3.0 introduced pcap_open(); it also introduced pcap_findalldevs_ex() and pcap_createsrcstr(). If you're going to put pcap_open() in libpcap, there's not much point to doing so but not also putting pcap_findalldevs_ex() and pcap_createsrcstr() there. (And, in the future, there'll be support for remote capturing with pcap_create() and pcap_activate(), with no need for pcap_createsrcstr(), and a replacement for pcap_findalldevs() and pcap_findalldevs_ex(), which we'll also check for.) So there's no need to check for pcap_findalldevs_ex() or pcap_createsrcstr(). Change-Id: I9323aad20136684d05d1e909326792a2f1408887 Reviewed-on: https://code.wireshark.org/review/6311 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03Fix Windows x64 CMake buildGraham Bloice1-1/+1
Unfortunately Kerberos for Windows (kfw) has a different lib name for x86 & x64. Fix FindKERBEROS.cmake to check for both lib names. Change-Id: I525df6de099d4e50322226317bda8d93d7a8dd23 Reviewed-on: https://code.wireshark.org/review/6246 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23UseLemon (CMake): Fix indent (use space)Alexis La Goutte1-1/+1
Change-Id: I619d64d62d2fb96ab904d5ea15e3c37aa0319540 Reviewed-on: https://code.wireshark.org/review/5982 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-21Fix Python 3 compatibility in LocatePythonModulePeter Wu1-1/+1
Regression introduced with cb345eb4bd0149b4a71d6069f957600a83cc3417. Change-Id: I625432ac4572d2449cb6981a158e46c560a81f1a Reviewed-on: https://code.wireshark.org/review/5883 Reviewed-by: Maarten Bezemer <maarten.bezemer@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-18Use LocatePythonModule to locate asn2wrs.pyMaarten Bezemer2-21/+6
This reuses existing functionality and thereby making FindAsn2Wrs.cmake obsolete, resulting in a reduction of the cmake module maintaince load Change-Id: Ic6ae53e65236246c0cbe86f8c2f066a2d034e0b9 Reviewed-on: https://code.wireshark.org/review/5805 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18Use LocatePythonModule to find make-dissector-reg.py in order to make ↵Maarten Bezemer2-3/+56
UseMakeDissectorReg.cmake more generally (out-of-source) usable. Add make-dissector-reg.py to the Debian packages. Making it possible to generate out-of-source wireshark plugins. Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6 Reviewed-on: https://code.wireshark.org/review/5802 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Fix missing spaceMaarten Bezemer1-1/+1
Change-Id: Ia56ff1d78d584ca062a714aac097c05034279e34 Reviewed-on: https://code.wireshark.org/review/5807 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Invoke asn2wrs.py using a custom commandMaarten Bezemer1-3/+4
A custom target is defined to be always invalid, so asn2wrs.py is always invoked. A custom command is able to convert input file(s) into output file(s), the actual command is only invoked in the provided dependencies are changed. As an advantage the dependencies are correct, so cmake is able to determine when the output file is required, so it can be build in time. Change-Id: I84be5d408cfc87cf88d67b6073bea439febbe712 Reviewed-on: https://code.wireshark.org/review/5255 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Do not force the output directoryMaarten Bezemer1-2/+11
For out of source builds, the output directory should not point to wireshark source locations. By default it does point to the wireshark source directory (to stay compatible with the build in dissectors). When the A2W_OUTPUT_DIR variable is set to "_EMPTY_" the output lcoation argument (-O) is not invoked. Use A2W_FLAGS to set an output location for out of source builds (or use A2W_OUTPUT_DIR, which has the same result) Change-Id: I48b7486fcda982f0dce57cde3beacb99f946abd9 Reviewed-on: https://code.wireshark.org/review/5254 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17Use FindAsn2Wrs to find asn2wrs.pyMaarten Bezemer2-4/+22
A first step to make it possible to reuse the UseAsn2Wrs for out of source builds. Change-Id: Iefb34f943e06db3d6afed55ab69d3f26aa9d633d Reviewed-on: https://code.wireshark.org/review/5253 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-16Add Wireshark_LIBRARY variableMaarten Bezemer2-0/+13
This variable can be used to obtain the wireshark library(ies) (from the correct location). Change-Id: I90cd5b098eb746ac573a2c611113287b06c3b82b Reviewed-on: https://code.wireshark.org/review/5251 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-16Add cmake helper files for finding wiresharkMaarten Bezemer3-0/+47
These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 Reviewed-on: https://code.wireshark.org/review/5235 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-11CMake: Make it easier to generate the release notes & NEWS.Gerald Combs1-7/+14
Add convenience targets for generating the release notes and the NEWS file. Make sure we don't run multiple instances of a2x + AsciiDoc at the same time. Add the docbook directory to the build by default unless we're running Windows. Explain why we don't yet build docs on Windows. Make each docbook makefile target optional. Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on. Remove the Debian patch that hacked around the PDF requirement. Copy ws.css to the docbook build directory. Don't build PDF release notes. I'm not sure we ever used them and I don't want to install Java and FOP just to make a release. Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553 Reviewed-on: https://code.wireshark.org/review/5712 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-04CMake: Don't cache LUA_LIBRARIES.Gerald Combs1-1/+1
Don't cache the LUA_LIBRARIES variable. This matches the behavior of the other library modules and fixes a compilation problem on my machine where /usr/local/lib/liblua.dylib wasn't showing up in the various build.make and link.txt files. Change-Id: Ib75ef303f2e67b266a246621718d0ea2ab885dca Reviewed-on: https://code.wireshark.org/review/5603 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-17cmake:Joerg Mayer1-0/+3
Avoide rebuilding the guides each and every time. Don't print the single file guides to stdout. Change-Id: Ie94fc4b24676e9abc7258c4ea1c7fd3049a96fb6 Reviewed-on: https://code.wireshark.org/review/5367 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-11-11Fix a problem that causes build failures with CMake on Yosemite.Guy Harris1-0/+20
Change-Id: I52e81656470df887eb3c53b2632bf5a310b1b063 Reviewed-on: https://code.wireshark.org/review/5229 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.Gerald Combs2-7/+17
Have FindWSWinLibs check for WIRESHARK_LIB_DIR before WIRESHARK_BASE_DIR to match the behavior of config.nmake and the Windows buildbots, which set the former but not the latter. It looks like the latest GLib DLL contains GThread. Adjust FindGTHREAD2.cmake accordingly. Change-Id: I0232b1819eca9ba2c39ae6834daddf65af979d7d Reviewed-on: https://code.wireshark.org/review/4887 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 18:14:08 +0000