diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-22 06:21:53 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-03-01 19:23:39 +0000 |
commit | 6b54fbf3bfb7a3b0519637d01fa36bba8cec9c98 (patch) | |
tree | eb9ce7199c857fe314da04cabd448e9381e451ac /epan/crypt | |
parent | 5da2b437035dbd478293caa1c9242fe2e37924e6 (diff) |
CMake: Add more structure to libwireshark build
Smaller epan/CMakeLists.txt is easier to work with and this structure
is well suited to CMake. It should make it easier to manage and configure
each epan module differently if necessary.
Change-Id: Ia649db3b7dcd405aa43dbdba3288699d5e375229
Reviewed-on: https://code.wireshark.org/review/14068
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/crypt')
-rw-r--r-- | epan/crypt/CMakeLists.txt | 65 | ||||
-rw-r--r-- | epan/crypt/Makefile.am | 3 |
2 files changed, 67 insertions, 1 deletions
diff --git a/epan/crypt/CMakeLists.txt b/epan/crypt/CMakeLists.txt new file mode 100644 index 0000000000..66a64cd5c8 --- /dev/null +++ b/epan/crypt/CMakeLists.txt @@ -0,0 +1,65 @@ +# CMakeLists.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. +# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +set(CRYPT_FILES + airpdcap.c + airpdcap_ccmp.c + airpdcap_debug.c + airpdcap_rijndael.c + airpdcap_tkip.c + ${CUSTOM_CRYPT_SRC} +) +source_group(crypt FILES ${CRYPT_FILES}) + +if(WERROR_COMMON_FLAGS) + set_source_files_properties( + ${CRYPT_FILES} + PROPERTIES + COMPILE_FLAGS ${WERROR_COMMON_FLAGS} + ) +endif() + +add_library(crypt OBJECT + ${CRYPT_FILES} +) + +set_target_properties(crypt PROPERTIES + FOLDER "Libs/epan/crypt" + COMPILE_DEFINITIONS "WS_BUILD_DLL" +) + +# +# Editor modelines - http://www.wireshark.org/tools/modelines.html +# +# Local variables: +# c-basic-offset: 8 +# tab-width: 8 +# indent-tabs-mode: t +# End: +# +# vi: set shiftwidth=8 tabstop=8 noexpandtab: +# :indentSize=8:tabSize=8:noTabs=false: +# diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am index c8da5b7c03..a6356ab968 100644 --- a/epan/crypt/Makefile.am +++ b/epan/crypt/Makefile.am @@ -43,7 +43,8 @@ libairpdcap_la_SOURCES = \ EXTRA_DIST = \ Custom.common \ Makefile.common \ - Makefile.nmake + Makefile.nmake \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ |