aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/CMakeLists.txt19
-rw-r--r--epan/ftypes/CMakeLists.txt42
2 files changed, 47 insertions, 14 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index c744da5572..6b12a848c0 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -43,6 +43,9 @@ set(CRYPT_LIB crypt )
add_subdirectory( dfilter )
set(DFILTER_LIB dfilter )
+add_subdirectory( ftypes )
+set(FTYPES_LIB ftypes )
+
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/dfilter
@@ -54,6 +57,7 @@ link_directories(
crc
crypt
dfilter
+ ftypes
wslua
wspython
)
@@ -1000,20 +1004,6 @@ register_dissector_files(register.c
${DISSECTOR_FILES}
)
-set(FTYPE_FILES
- ftypes/ftypes.c
- ftypes/ftype-bytes.c
- ftypes/ftype-double.c
- ftypes/ftype-integer.c
- ftypes/ftype-ipv4.c
- ftypes/ftype-guid.c
- ftypes/ftype-none.c
- ftypes/ftype-pcre.c
- ftypes/ftype-string.c
- ftypes/ftype-time.c
- ftypes/ftype-tvbuff.c
-)
-
ADD_CUSTOM_COMMAND(
OUTPUT sminmpec.c
COMMAND ${PERL_EXECUTABLE}
@@ -1151,6 +1141,7 @@ target_link_libraries(epan
${CRC_LIB}
${CRYPT_LIB}
${DFILTER_LIB}
+ ${FTYPES_LIB}
${WSLUA_LIB}
${WSPYTHON_LIB}
)
diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt
new file mode 100644
index 0000000000..9c5d9f3ad0
--- /dev/null
+++ b/epan/ftypes/CMakeLists.txt
@@ -0,0 +1,42 @@
+# CMakeLists.txt
+#
+# $Id$
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set(FTYPES_FILES
+ ftypes.c
+ ftype-bytes.c
+ ftype-double.c
+ ftype-integer.c
+ ftype-ipv4.c
+ ftype-guid.c
+ ftype-none.c
+ ftype-pcre.c
+ ftype-string.c
+ ftype-time.c
+ ftype-tvbuff.c
+)
+
+add_library(ftypes STATIC
+ ${FTYPES_FILES}
+)