From deef1dc1ff22183c0b70ea65775c23c404c641bb Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Thu, 16 Jun 2016 14:58:19 -0700 Subject: cmake: add PIDL dissector generation support The dissectors list is generated based on regex magic on pidl/Makefile. A dssetup.cnf file is added because all other protocols already have this file. The srvsvc and wkssvc protocols cannot be built for some reason, so just disable it (this mirrors the original Makefile). Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing compared to autotools. Tested with an out-of-tree and in-tree build with cmake (make and ninja): cmake -GNinja && ninja -v pidl-dissectors touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03 Reviewed-on: https://code.wireshark.org/review/15962 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- CMakeOptions.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'CMakeOptions.txt') diff --git a/CMakeOptions.txt b/CMakeOptions.txt index d4ed10933e..1f73fe7b45 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -19,7 +19,6 @@ option(BUILD_sshdump "Build sshdump" ON) option(BUILD_ciscodump "Build ciscodump" ON) option(BUILD_randpktdump "Build randpktdump" ON) option(AUTOGEN_dcerpc "Autogenerate DCE RPC dissectors" OFF) -option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) option(DISABLE_WERROR "Do not treat warnings as errors" OFF) option(EXTCAP_ANDROIDDUMP_LIBPCAP "Build androiddump using libpcap" OFF) -- cgit v1.2.3