From 3b46e6eaf61a29f9bd8f8c162caa54cc2ea81fe2 Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Thu, 18 Sep 2014 08:05:48 +0200 Subject: Having CmakeListsCustom.txt in git defeats the purpose of its existence: If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its including parent). - Optionally allow a list of custom includes instead of the default one. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6 Reviewed-on: https://code.wireshark.org/review/4163 Reviewed-by: Jörg Mayer --- CMakeListsCustom.txt.example | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 CMakeListsCustom.txt.example (limited to 'CMakeListsCustom.txt.example') diff --git a/CMakeListsCustom.txt.example b/CMakeListsCustom.txt.example new file mode 100644 index 0000000000..92d28b6c6d --- /dev/null +++ b/CMakeListsCustom.txt.example @@ -0,0 +1,28 @@ +# CMakeListsCustom.txt +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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. +# +# Add a list of your custom plugins SRC dir here including the path +# + +set(CUSTOM_PLUGIN_SRC_DIR +# private_plugins/foo +# or +# plugins/foo +) -- cgit v1.2.1