aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeOptions.txt
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-08-10 10:20:30 -0700
committerMichael Mann <mmann78@netscape.net>2017-08-12 13:53:59 +0000
commit537b083e028c636b8f8afc4a847e186f4abca59f (patch)
treee46fdbe05f81b850d6f31d125e5353d558d4e906 /CMakeOptions.txt
parentdc2a2424b48086ac2f79abc322070a4498d01607 (diff)
Sync some CMake and Autotools install behaviors.
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>
Diffstat (limited to 'CMakeOptions.txt')
-rw-r--r--CMakeOptions.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index be4169c9eb..477a79de0d 100644
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -3,7 +3,7 @@
option(BUILD_wireshark "Build Wireshark" ON)
option(BUILD_wireshark_gtk "Build Wireshark (GTK+ UI)" OFF)
option(BUILD_tshark "Build tshark" ON)
-option(BUILD_tfshark "Build tfshark" ON)
+option(BUILD_tfshark "Build tfshark" OFF)
option(BUILD_rawshark "Build rawshark" ON)
option(BUILD_dumpcap "Build dumpcap" ON)
option(BUILD_text2pcap "Build text2pcap" ON)
@@ -14,6 +14,9 @@ option(BUILD_capinfos "Build capinfos" ON)
option(BUILD_captype "Build captype" ON)
option(BUILD_randpkt "Build randpkt" ON)
option(BUILD_dftest "Build dftest" ON)
+option(BUILD_corbaidl2wrs "Build corbaidl2wrs" OFF)
+option(BUILD_dcerpcidl2wrs "Build dcerpcidl2wrs" ON)
+option(BUILD_xxx2deb "Build xxx2deb" OFF)
option(BUILD_androiddump "Build androiddump" ON)
option(BUILD_sshdump "Build sshdump" ON)
option(BUILD_ciscodump "Build ciscodump" ON)