diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-09-18 08:05:48 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-09-18 07:02:00 +0000 |
| commit | 3b46e6eaf61a29f9bd8f8c162caa54cc2ea81fe2 (patch) | |
| tree | 529bfa2bd7e8a0da4b95b392efa9c8a834e04789 /plugins | |
| parent | 84629f43cb6c19ca2e0e512ac2429584925be896 (diff) | |
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.
Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6
Reviewed-on: https://code.wireshark.org/review/4163
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CMakeListsCustom.txt | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/plugins/CMakeListsCustom.txt b/plugins/CMakeListsCustom.txt deleted file mode 100644 index f9cd0fbf83..0000000000 --- a/plugins/CMakeListsCustom.txt +++ /dev/null @@ -1,28 +0,0 @@ -# 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. -# -# Add a list of your custom plugins SRC dir here including the path -# - -set(CUSTOM_PLUGIN_SRC_DIR -# private_plugins/foo -# or -# plugins/foo -)
\ No newline at end of file |