diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-02 16:32:04 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-03-03 03:45:58 +0000 |
commit | 4fca15308968d6fd526eb67497148d2cd6c0b703 (patch) | |
tree | 658708d02b859118717f9184feb83fbf83817e7f /epan | |
parent | dc92e98db42c6ef55616940bc26cc989180fefdc (diff) |
Add missing cmake custom source includes
Change-Id: Ib1c1632a3e9fe1088a9a1da9870a81b1f846cf95
Reviewed-on: https://code.wireshark.org/review/14291
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
-rw-r--r-- | epan/crypt/CMakeLists.txt | 2 | ||||
-rw-r--r-- | epan/crypt/CMakeListsCustom.txt.example | 25 | ||||
-rw-r--r-- | epan/dissectors/CMakeLists.txt | 2 | ||||
-rw-r--r-- | epan/dissectors/CMakeListsCustom.txt.example (renamed from epan/CMakeListsCustom.txt.example) | 8 |
5 files changed, 31 insertions, 8 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 36a6a4fe67..49321d88e2 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -21,8 +21,6 @@ include(UseABICheck) -ADD_CUSTOM_CMAKE_INCLUDE() - if (HAVE_HFI_SECTION_INIT) add_definitions( -DHAVE_HFI_SECTION_INIT diff --git a/epan/crypt/CMakeLists.txt b/epan/crypt/CMakeLists.txt index 66a64cd5c8..de05ad62c4 100644 --- a/epan/crypt/CMakeLists.txt +++ b/epan/crypt/CMakeLists.txt @@ -19,6 +19,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +ADD_CUSTOM_CMAKE_INCLUDE() + include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/epan/crypt/CMakeListsCustom.txt.example b/epan/crypt/CMakeListsCustom.txt.example new file mode 100644 index 0000000000..4821e20b89 --- /dev/null +++ b/epan/crypt/CMakeListsCustom.txt.example @@ -0,0 +1,25 @@ +# 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_CRYPT_SRC +# foo.c +) diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt index a6889766ad..5922c117e2 100644 --- a/epan/dissectors/CMakeLists.txt +++ b/epan/dissectors/CMakeLists.txt @@ -19,6 +19,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +ADD_CUSTOM_CMAKE_INCLUDE() + add_subdirectory(dcerpc) include_directories( diff --git a/epan/CMakeListsCustom.txt.example b/epan/dissectors/CMakeListsCustom.txt.example index d1f41d62ab..b49a5626fb 100644 --- a/epan/CMakeListsCustom.txt.example +++ b/epan/dissectors/CMakeListsCustom.txt.example @@ -21,13 +21,9 @@ # You can add custom builtin dissectors here by replaceing foo with your dissectors name. set(CUSTOM_DISSECTOR_SRC -# dissectors/packet-foo.c +# packet-foo.c ) set(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC -# dissectors/packet-foo.c +# packet-bar.c ) - -set(CUSTOM_CRYPT_SRC -# crypt/foo.c -)
\ No newline at end of file |