diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-01-12 19:16:15 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-01-12 19:16:15 +0000 |
| commit | f6ffb03ccbb2202d4a789aef955d4401692e546d (patch) | |
| tree | d37427612f727e4e98a57be47e6d5be8a7e444d2 /CMakeLists.txt | |
| parent | dc96e5fee266a3c27110a8ee1b347ff4833102ce (diff) | |
CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before
register_tap_files so that the "-z" flag works for TShark.
epan/stat_cmd_args.c: Fixup whitespace.
svn path=/trunk/; revision=40443
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29f1da6fcc..630c2d7545 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -495,10 +495,6 @@ ADD_CUSTOM_COMMAND( ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl ) -register_tap_files(tshark-tap-register.c - ${TSHARK_TAP_SRC} -) - ADD_CUSTOM_COMMAND( OUTPUT ps.c COMMAND ${PYTHON_EXECUTABLE} @@ -688,6 +684,10 @@ if(BUILD_wireshark AND GTK_FOUND) install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() +register_tap_files(tshark-tap-register.c + ${TSHARK_TAP_SRC} +) + if(BUILD_tshark) set(tshark_LIBS ${LIBEPAN_LIBS} |