aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2014-09-01 10:51:21 +0200
committerAnders Broman <a.broman58@gmail.com>2014-09-01 11:40:27 +0000
commit85734de534d4fbc936ebf5eb55242a9b76b4747b (patch)
tree8648b4c8efb643aad5d0c459feee5d91cdaf99d4
parentaf3e2dbdc619c466f238348ca0105da4e0ff48a0 (diff)
Make it possible to build builtin custom dissectors and GUI files with cmake too.
Change-Id: I28eee44f7c3a7e44da89f8b71cdacbe78115c7e3 Reviewed-on: https://code.wireshark.org/review/3943 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/CMakeLists.txt4
-rw-r--r--epan/CMakeListsCustom.txt29
-rw-r--r--ui/gtk/CMakeLists.txt3
-rw-r--r--ui/gtk/CMakeListsCustom.txt31
4 files changed, 67 insertions, 0 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index e18c8f3667..818a50853c 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -21,6 +21,8 @@
include(UseABICheck)
+include(CMakeListsCustom.txt)
+
if (HAVE_HFI_SECTION_INIT)
add_definitions(
-DHAVE_HFI_SECTION_INIT
@@ -1444,6 +1446,8 @@ set(DISSECTOR_FILES
${DIRTY_PIDL_DISSECTOR_SRC}
${ASN1_DISSECTOR_SRC}
${DIRTY_ASN1_DISSECTOR_SRC}
+ ${CUSTOM_DISSECTOR_SRC}
+ ${CUSTOM_DIRTY_ASN1_DISSECTOR_SRC}
)
source_group(dissectors FILES ${DISSECTOR_FILES})
diff --git a/epan/CMakeListsCustom.txt b/epan/CMakeListsCustom.txt
new file mode 100644
index 0000000000..7024bc1b3f
--- /dev/null
+++ b/epan/CMakeListsCustom.txt
@@ -0,0 +1,29 @@
+# CMakeListsCustom.txt
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# You can add custom builtin dissectors here by replaceing foo with your dissectors name.
+
+set(CUSTOM_DISSECTOR_SRC
+# dissectors/packet-foo.c
+)
+
+set(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC
+# dissectors/packet-foo.c
+) \ No newline at end of file
diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt
index 545781eebc..38f4050ecd 100644
--- a/ui/gtk/CMakeLists.txt
+++ b/ui/gtk/CMakeLists.txt
@@ -19,6 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
+include(CMakeListsCustom.txt)
set(WIRESHARK_GTK_SRC
about_dlg.c
@@ -117,6 +118,8 @@ set(WIRESHARK_GTK_SRC
uat_gui.c
voip_calls.c
webbrowser.c
+ ${WIRESHARK_CUSTOM_GTK_SRC}
+ ${WIRESHARK_CUSTOM_TAP_SRC}
)
if(HAVE_EXTCAP)
diff --git a/ui/gtk/CMakeListsCustom.txt b/ui/gtk/CMakeListsCustom.txt
new file mode 100644
index 0000000000..57ff1b7a02
--- /dev/null
+++ b/ui/gtk/CMakeListsCustom.txt
@@ -0,0 +1,31 @@
+# CMakeListsCustom.txt
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# You can add custom GUI files here by replacing the commented out file foo with your file.
+
+#Add GUI source files here
+set(WIRESHARK_CUSTOM_GTK_SRC
+# foo.c
+)
+
+#Add your tap source files here:
+set(WIRESHARK_CUSTOM_TAP_SRC
+# tap_foo.c
+)