aboutsummaryrefslogtreecommitdiffstats
path: root/doc/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2017-08-12Sync some CMake and Autotools install behaviors.Gerald Combs1-9/+28
Adjust the following CMake and Autotools behaviors in order to synchronize their respective install behaviors: - Disable tfshark by default in CMakeOptions.txt - Add profiles/Bluetooth/preferences to Makefile.am - Add missing captype and ciscodump entries to doc/Makefile.am - Install help/faq.txt on all platforms in CMakeLists.txt - Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb options to CMake and use them to adjust the corresponding parts of the build. - Pull the DCERPC idl2wrs build steps into the top-level CMakeLists.txt. This change doesn't sync everything. Some installed content still diverges, including the following: - CMake installs a bunch of modules into lib/wireshark: FindGLIB2.cmake FindWireshark.cmake FindWSWinLibs.cmake LocatePythonModule.cmake UseAsn2Wrs.cmake UseMakeDissectorReg.cmake WiresharkConfig.cmake WiresharkConfigVersion.cmake Do we need any or all of these? If so, should the Autotools behavior be synced accordingly? - Autotools installs libtool .la files. It also installs wireshark-gtk.desktop unconditionally. Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22 Reviewed-on: https://code.wireshark.org/review/23041 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-20cmake: add dependency to build manual pagesPeter Wu1-0/+5
"add_custom_command" outputs are only available as dependency in the same directory, so create a new target such it can be used from the main directory. This fixes the OS X build with no parallelism (-j1). Change-Id: I66aa5ae307be38ee715456a05fd55f55e4fa76e9 Reviewed-on: https://code.wireshark.org/review/18299 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: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-14CMakeLists: Add man filesUli Heilmeier1-0/+3
Current Wireshark.app bundle on OS X doesn't include man pages. This is the second try after commit 7da23ca1a5bba4af5e1104f4d3d3d44e918552b0 has been reverted. Now cmake gets the information that the man files are generated. Bug: 12746 Change-Id: I34dfec65bd57587ee048d7e1e2557fc9ab2b32eb Reviewed-on: https://code.wireshark.org/review/18170 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-08Revert "CMakeLists: Add man files"Uli Heilmeier1-3/+0
This reverts commit 55148a2ea470d19290d236428f3c8e725775c96a. Change-Id: If93b97933cae4d8ffd1e4cc9a635def031ab0cc6 Reviewed-on: https://code.wireshark.org/review/18123 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-05CMakeLists: Add man filesUli Heilmeier1-0/+3
Current Wireshark.app bundle on OS X doesn't include man pages. Change-Id: I4123105ae805c3f127dbfd74768b88d4da546c56 Ping-Bug: 12746 Reviewed-on: https://code.wireshark.org/review/17902 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-16extcap: add udpdump.Dario Lombardo1-0/+3
Udpdump is a generic UDP receiver that exports datagram in PCAP format. Change-Id: I52620a92b12530b6f9b5449c43e692663acdfc14 Reviewed-on: https://code.wireshark.org/review/17195 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-04-25Compile sshdump and ciscodump for WindowsPascal Quantin1-0/+2
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43 Reviewed-on: https://code.wireshark.org/review/12117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-24extcap: add ciscodump.Dario Lombardo1-0/+3
Ciscodump is a new extcap that allows packet capture on Cisco routers (IOS 12.4 and later) through SSH. Change-Id: Ic9c5be01d3bd0112116f7fc9fa10e26c1552b007 Reviewed-on: https://code.wireshark.org/review/13886 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-11cmake: Copy docs to build datafile dir for NSIS packaging.João Valverde1-5/+1
Change-Id: Icc1f6dadc8bb082c4049cafc6a7e6c2d030ec85e Reviewed-on: https://code.wireshark.org/review/14409 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10Fix NSIS installerJoão Valverde1-0/+5
Broken by gb7f6cf9. Change-Id: I21a91cf56c16b7ffdf72da7bf68a556feb6a6c17 Reviewed-on: https://code.wireshark.org/review/14408 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10Add doc/CMakeLists.txtJoão Valverde1-0/+185
Change-Id: I387e893dc5b8b38569f7189d078fdc1853ba012f Reviewed-on: https://code.wireshark.org/review/14269 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 16:58:36 +0000