aboutsummaryrefslogtreecommitdiffstats
path: root/README.cmake
AgeCommit message (Collapse)AuthorFilesLines
2017-08-04WSDG: Update the Windows docs and add a CMake section.Gerald Combs1-217/+0
Update the Windows section for Visual Studio 2015. Copy the content from README.cmake to its own WSDG section and remove README.cmake. Remove the PowerShell sections. Our required version (2.0) ships with every supported version of Windows. Remove the sed section. Change-Id: Id37c6e71bacc247a3ed1992adb1408ec13f6a187 Reviewed-on: https://code.wireshark.org/review/22940 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-15Miscellaneous texual corrections and additionJaap Keuter1-0/+5
Correct some symbolic references in source file comments and add a note about the CMake configuration options. Change-Id: Idb670a2c798c2a52cdce142340ce8fc5a2022508 Reviewed-on: https://code.wireshark.org/review/22138 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris1-6/+6
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-18cmake: install icons and .desktop filesPeter Wu1-2/+0
Based on the install-data-local target from Makefile.am. Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c Reviewed-on: https://code.wireshark.org/review/18708 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2016-06-29CMake: Update the macOS wrapper script behavior.Gerald Combs1-0/+3
CMake on macOS creates a convenience wrapper (run/wireshark) that runs run/Wireshark.app/Contents/MacOS/Wireshark. Have it run the executable using "exec" instead of opening the bundle using "open" so that Wireshark runs in the foreground. Change-Id: I295ce0681da75678e5e01781e9c8fb58e2236fc9 Reviewed-on: https://code.wireshark.org/review/16196 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-16filesystem: Fix build dir detection when using cmakePeter Wu1-27/+0
Fixes loading of plugins by detecting the build output directory of cmake. This requires a "CMakeCache.txt" file to be present in the parent directory (above run/). Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8 Reviewed-on: https://code.wireshark.org/review/7453 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>
2016-03-26Fix typo in README.cmakeDaniël van Eeden1-1/+1
Change-Id: I2bbb589c5a0c5cbab9fd6f0623682e119bbfd46a Reviewed-on: https://code.wireshark.org/review/14635 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-25CMake: Add a note about CMAKE_TRY_COMPILE_CONFIGURATION.Gerald Combs1-0/+5
Note that CMAKE_TRY_COMPILE_CONFIGURATION can noticeably affect the run time of MSBuild, which in turn affects try_compile, which we call many, many times. Change-Id: I041d00e647ab570ec14f7c78b1d1d6806ac31ce4 Reviewed-on: https://code.wireshark.org/review/14630 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-26CMake: docs updateGraham Bloice1-4/+6
Small amendments to README.cmake Change-Id: I854baac2ce5b3ac1cd3c578d1bc976195599c9c4 Reviewed-on: https://code.wireshark.org/review/13555 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-10Apple calls it just "OS X" these days.Guy Harris1-1/+1
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4 Reviewed-on: https://code.wireshark.org/review/11703 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-16Keep CMake from finding Cygwin's Python.Gerald Combs1-5/+3
Try to find Python and set PYTHON_EXECUTABLE on Windows via the registry prior to calling FindPythonInterp. This works around a bug in CMake that prefers Cygwin's Python, which is a symlink, which by default is a text file that contains a Cygwin-specific cookie, which is therefore useless outside of Cygwin. This is avoids the need to pass -DPYTHON_EXECUTABLE=... to CMake. Change-Id: Ife37221b61d920682c20357b6d139a93067a5ad1 Reviewed-on: https://code.wireshark.org/review/11071 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-08-24Add notes about using CMake + Qt Creator.Gerald Combs1-0/+4
Change-Id: Ib10cc0a407721d62b39628af858f14e749c94d22 Reviewed-on: https://code.wireshark.org/review/10237 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-30CMake for Windows improvementsGraham Bloice1-9/+10
Allow the wireshark libs directory to be defined by WIRESHARK_LIB_DIR. Ensure either WIRESHARK_LIB_DIR or WIRESHARK_BASE_DIR is defined. Ensure the compiler is a supported version (VS2010, 12 or 13). Change-Id: I0abd371c5773c08ca255abe308d1a59e2e290a02 Reviewed-on: https://code.wireshark.org/review/8247 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-04-29Update CMake docs for WindowsGraham Bloice1-21/+31
Change-Id: Ib08935d09d5e1b4db76bd56effd17097faca4468 Reviewed-on: https://code.wireshark.org/review/8239 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-16Update README.cmake.Gerald Combs1-7/+1
Change-Id: I2aaae7936639dc2775a8f7fdb1d4276893c8a6dc Reviewed-on: https://code.wireshark.org/review/8097 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-26CMake updates for Windows buildGraham Bloice1-4/+2
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-04Note that the Lua tests don't work in cmake.Jeff Morriss1-1/+4
(Also point out that we really want cross-compilation to work since people do use it--with autotools.) Change-Id: I0570e0d3e4063c53699233e950687d86aa34b651 Reviewed-on: https://code.wireshark.org/review/7528 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-20Possibility -> certainty.Guy Harris1-3/+4
Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28 Reviewed-on: https://code.wireshark.org/review/6678 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-20Fix one item.Guy Harris1-7/+13
We *do* get the absolute path of the executable, so we *could* look for "run" right before the executable name. The issue is that there's not the stronger libtool-imposed convention that the executable is in ".libs", so the chances of a false positive or false negative are higher. Change-Id: Ib2d5f370d50fee07479c4ffe6f90ba4a91c7f271 Reviewed-on: https://code.wireshark.org/review/6676 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11CMake: Make it easier to generate the release notes & NEWS.Gerald Combs1-1/+2
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-03Make a note that cmake needs to install the freedesktop integration files too.Jeff Morriss1-0/+2
Change-Id: I5eeeb2fa32e8f90bc56f0515e0fc9f6c5f88eb79 Reviewed-on: https://code.wireshark.org/review/5602 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-10-20CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows.Gerald Combs1-3/+7
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-10Update READMEs to reflect recent CMake environment changes.Gerald Combs1-0/+3
Change-Id: Idbf879f20448eea0b69e793271439dec877832e9 Reviewed-on: https://code.wireshark.org/review/4602 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01WSUG: Convert the ``File I/O'' chapter to AsciiDoc.Gerald Combs1-0/+3
Leave most of the content intact for now. Remove images for no-longer-supported versions of GTK+. Add an example for building the Guides to README.cmake. Change-Id: Id9e6a308c91b594d1fb7f107d7b9b28074a92a8b Reviewed-on: https://code.wireshark.org/review/3931 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-25More README.cmake updates.Gerald Combs1-11/+19
Change-Id: I1c7e51ee397171af0703878e509665c8119b37ba Reviewed-on: https://code.wireshark.org/review/3841 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15README.cmake: List more cmake options.Gerald Combs1-4/+20
Change-Id: I80b5c82f57c4de55aba9c7ee8044f565c9819d7e Reviewed-on: https://code.wireshark.org/review/3630 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-03Add some issues that came up when comparing autotools and CMake compile flags.Guy Harris1-4/+7
Also be consistent about whether OS X is working or not, and note that we're also doing CMake builds on Solaris. Change-Id: I2da18d2fb5aec7e5806dc7ea186f729acef94272 Reviewed-on: https://code.wireshark.org/review/3389 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Add an OSX_DEPLOY_TARGET option to control building for a target OS version.Guy Harris1-3/+4
It should be set to an OS version, such as "10.5" or "10.6" or..., and, if set (and if you're building for "APPLE"), it'll try to find the SDK (and fail if it's not found), and add appropriate -isysroot, -mmacosx-version-min, and, if appropriate, -m32 compiler options. (It will need more work once we support building OS X app bundles and installers; pick up more stuff from configure.ac for that.) Change-Id: I0aebf2db8aa39304a41be4e2a9879dea6f308ec7 Reviewed-on: https://code.wireshark.org/review/3388 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-01Update to match the current Windows Buildbot environment.Gerald Combs1-23/+21
Update some OS X information as well. Change-Id: I9a252ec83712848696dbb531e6da15b3c7644591 Reviewed-on: https://code.wireshark.org/review/3327 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-31Add some information on running from the build directory.Guy Harris1-1/+17
Change-Id: I6c01141cd02af358152d007175ec0b51357e42b3 Reviewed-on: https://code.wireshark.org/review/3298 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31Need to make Windows installer packages as well.Guy Harris1-1/+2
Change-Id: I5e5483ead229ff74fb7bacba72459e324f9bd510 Reviewed-on: https://code.wireshark.org/review/3294 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31We need to support building against an SDK on OS X.Guy Harris1-0/+1
Change-Id: I1fe9390e450dcb3669653a94d95339bce3182799 Reviewed-on: https://code.wireshark.org/review/3293 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31Include OS X installer dmgs as a package type we need to support.Guy Harris1-2/+2
Change-Id: I419fa4889d1fc2a9fd12ec19385543bd085e6b1e Reviewed-on: https://code.wireshark.org/review/3292 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31cmake also needs to learn to build SVR4 packages.Jeff Morriss1-1/+1
Change-Id: I030e84b9247b273b01890a47d92109dd603e3247 Reviewed-on: https://code.wireshark.org/review/3288 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-14Make it harder to miss that this is also about Win buildsJoerg Mayer1-3/+3
Change-Id: Id4fd7a4672ed32dfcb57a4435a6b3e5cf2e5ca3d Reviewed-on: https://code.wireshark.org/review/2207 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-09Use only dpkg-buildpackage for building .debsBalint Reczey1-3/+0
This makes .deb generation not depending on autotools and also removes debian-package target from autotools-generated Makefile. Change-Id: Ia684cd310d85906763af1035fddf39c1fbaed984 Reviewed-on: https://code.wireshark.org/review/2052 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-08Update CMake build for win32 to build QT again, and to findGraham Bloice1-1/+3
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-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \$Id\$/,+1 d') (No star only 2 spaces before) Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54 Reviewed-on: https://code.wireshark.org/review/883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-01-19Fix a typoJörg Mayer1-1/+1
svn path=/trunk/; revision=54842
2013-12-04Finally successfully built with the msvc2010 GUI a DebugJörg Mayer1-0/+2
and a RelWithDebInfo build, after adding the missing path to the cygwin tools. svn path=/trunk/; revision=53790
2013-12-04On Windows:Jörg Mayer1-0/+5
- Add instructions how to build zlib - Add information how to build with msbuild svn path=/trunk/; revision=53776
2013-12-02Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part ofJörg Mayer1-1/+1
the QT5_BASE_DIR value. svn path=/trunk/; revision=53717
2013-11-10Make FindGTK3 work on windowsJörg Mayer1-1/+1
svn path=/trunk/; revision=53218
2013-11-09cmake builds against gtk3 don't work. Those against gtk2 do.Jörg Mayer1-1/+1
svn path=/trunk/; revision=53188
2013-11-01Release notes are done.Jörg Mayer1-1/+0
svn path=/trunk/; revision=53034
2013-10-29Add some items to the list of things still to be done.Jeff Morriss1-1/+6
svn path=/trunk/; revision=52952
2013-10-14Make pkgconfig work - sort of:Jörg Mayer1-0/+1
- 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
2013-10-12Remove some things that I added while not understanding the realJörg Mayer1-3/+2
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
2013-10-11The path for the Qt5 installation now needs to be set as aJörg Mayer1-0/+1
windows environment variable. svn path=/trunk/; revision=52540
2013-10-10Build qtshark by default, use qt5 by default. To turnJörg Mayer1-1/+1
off building qtshark do "cmake ... -DBUILD_qtshark=OFF ..." or change your local copy of CMakeOptions.txt Small update to README.cmake (when running nmake I recommend using /X- to avoid some (viewing) corruptions. svn path=/trunk/; revision=52501
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 20:27:09 +0000