aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-10-01cmake: update FindGTK2 to v3.0.1-1824-g0b12815Peter Wu1-146/+452
Current FindGTK2.cmake as included with Wireshark cannot do a 32-bit build even after setting CMAKE_LIBRARY_PATH=/usr/lib32. After an update to upstream FindGTK2 (v3.0.1-1824-g0b12815), things build again. Compared to upstream FindGTK2, FindWSWinLibs and related hints have been added (note that "${GTK2_HINTS}/lib" is not a typo, it is needed as some headers are includes in locations like lib/gtk-2.0/include/). The include paths have become relative again as there are no files like FindPackageHandleStandardArgs in the Wireshark source tree. Diff between upstream FindGTK2 and the version in this patch: diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index 72bb8eb..9b4f989 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -167,2 +167,5 @@ +include( FindWSWinLibs ) +FindWSWinLibs( "gtk2" "GTK2_HINTS" ) + #============================================================= @@ -176,4 +179,4 @@ -include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake) +include(SelectLibraryConfigurations) +include(CMakeParseArguments) @@ -289,2 +292,5 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) ${_suffixes} + HINTS + "${GTK2_HINTS}/include" + "${GTK2_HINTS}/lib" ) @@ -395,2 +401,4 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib + HINTS + "${GTK2_HINTS}/lib" ) @@ -409,2 +417,4 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib + HINTS + "${GTK2_HINTS}/lib" ) @@ -829,3 +839,3 @@ set(_GTK2_did_we_find_everything true) # This gets set to GTK2_FOUND -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) Change-Id: I02103409a79ea30d1bf7cc0dfb43a9e41f8a4db3 Reviewed-on: https://code.wireshark.org/review/4293 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-01cmake: use pkg-config for resolving dependenciesPeter Wu9-25/+106
Changes: * Fix glib2 search path. * Add pkg-config support to CAP, GEOIP, GNUTLS, LUA, PortAudio (API 19), zlib, kerberos. * Add pkg-config support to libnl3, libnl2 and libnl1 (but tested only with libnl3). This makes it easier to do 32-bit builds on 64-bit hosts by just setting `PKG_CONFIG_LIBDIR`. Due to how HINTS work, it is still fragile though: missing 32-bit libraries will cause a fallback to 64-bit libraries. A future patch could check for `<PREFIX>_FOUND` and remove the manual `find_path` and `find_library` hackery since the paths are already known. Change-Id: Ieb4fb74695c96afb1a4c70168e84abb1fa4612c6 Reviewed-on: https://code.wireshark.org/review/4292 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-28Add support for getting nanosecond time stamp resolution when capturing.Guy Harris1-0/+1
If we have pcap_set_tstamp_precision(), use it to request nanosecond time stamp resolution *if* we're writing a pcap-ng file; any code that reads those files and can't handle nanosecond time stamp resolution is broken and needs to be fixed. If we're writing a pcap file, don't ask for nanosecond resolution time stamps, as that requires a different magic number for pcap files, and not all code that reads pcap files can handle that. (Unlike pcap-ng, where the ability to have non-microsecond time stamp resolution was present from Day One, it's a relatively recent addition to pcap.) We could add a command-line option/GUI option for that, like the option recent versions of tcpdump have, if it matters. Change-Id: I8fa464eb929feecb9a70be70712502c9f0cc5270 Reviewed-on: https://code.wireshark.org/review/4355 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-18Having CmakeListsCustom.txt in git defeats the purpose of its existence:Joerg Mayer1-0/+20
If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its including parent). - Optionally allow a list of custom includes instead of the default one. Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6 Reviewed-on: https://code.wireshark.org/review/4163 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25As long as NEWS is still part of the git tree: At least don't differJoerg Mayer1-1/+1
because of different timezones. Change-Id: I93809447db29c2cc5f848edb438ee16372b57453 Reviewed-on: https://code.wireshark.org/review/3824 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-24Convert admon graphics to SVG.Gerald Combs1-6/+5
Use a common set of SVG files for AsciiDoc / DocBook admonition graphics. Put them in a common directory. According to http://caniuse.com/svg all common browsers have had SVG support for a while now. The graphics themselves were created with Inkscape. If you would like to refine them further you are more than welcome. Use variables to assemble xsltproc commands in Autotools and Nmake while we're here. Try to update Debian rules to reflect ga92c3fb. Change-Id: If82647af27a60117c517125dff0aca81c033be72 Reviewed-on: https://code.wireshark.org/review/3206 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24CMake: More a2x / asciidoc fixes.Gerald Combs2-34/+50
Create graphics directories and copy files into them similar to Autotools and Nmake. Adjust some xsltproc arguments. Fix the --asciidoc-opts flag. Note: Admon graphics are broken pending change 3206. Change-Id: I94d498de36150a7cb4ffd080581523300b222bd4 Reviewed-on: https://code.wireshark.org/review/3805 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-23WSUG: Convert the "User Interface" chapter to AsciiDoc.Gerald Combs2-41/+74
Add the "asciidoc.conf" compatibility configuration file from Asciidoctor. Although we don't use Asciidoctor it gives us macros that keep us from losing some useful DocBook elements. Update various CMake files to support multiple AsciiDoc configuration files. Leave most of the content intact for now. Hopefully the other chapters aren't as laden with markup. Change-Id: Id69757342b86abb2b3130cb61e90f5695a26ea8a Reviewed-on: https://code.wireshark.org/review/3680 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-22Add WinSparkle to the CMake build to bring it into line withGraham Bloice1-0/+35
the nmake build Change-Id: I944d0fe15b396cad4d0054b6fc359acb42ae3c9c Reviewed-on: https://code.wireshark.org/review/3755 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-22Move generating HAVE_AIRPCAP to main CMakeLists.txt as is done withJoerg Mayer1-2/+0
other liberaries. Also: After set( variable 0 ) the variable is defined. Change-Id: Id26a771875b7643c19f173ce77bb29a4059a1bd0 Reviewed-on: https://code.wireshark.org/review/3793 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-21Fix CMake checks of PCap functions, along with AirPCapGraham Bloice2-2/+5
Change-Id: If55498167d5e357258841f2194962749c0dfc81e Reviewed-on: https://code.wireshark.org/review/3787 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 02:47:07 +0000