- now wireshark compiles with cmake as well

svn path=/trunk/; revision=29799

4 files changed, 31 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e99f85714..b2bfcd591d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,17 +172,22 @@ endif()
 
 
 add_subdirectory( epan )
+add_subdirectory( gtk )
 add_subdirectory( wiretap )
 add_subdirectory( wsutil )
 
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
 
 link_directories(
+	epan
 	wiretap
 	wsutil
-	epan
 )
 
+if(BUILD_wireshark)
+	link_directories( gtk )
+endif()
+
 ADD_CUSTOM_COMMAND(
 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
 	COMMAND ${PERL} ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
@@ -286,11 +291,11 @@ set(TSHARK_TAP_SRC
         tap-wspstat.c
 )
 
-set(LIBWIRESHARK_LIBS
+set(LIBEPAN_LIBS
 #		$(wireshark_optional_objects)
 		wiretap
 		wsutil
-		wireshark
+		epan
 #		@INET_PTON_LO@
 #		@INET_NTOP_LO@
 #		@SSL_LIBS@
@@ -313,11 +318,11 @@ set(LIBWIRESHARK_LIBS
 if(BUILD_wireshark)
 # todo
 	set(wireshark_LIBS
-#		gtk/libui.a
+		ui
+		${GTK2_LIBRARIES}
 #		codecs/libcodec.a
-		${PORTAUDIO_LIBS}
-		${GTK2_LIBS}
-		${LIBWIRESHARK_LIBS}
+		${PORTAUDIO_LIBRARIES}
+		${LIBEPAN_LIBS}
 	)
 	set(wireshark_FILES
 		airpcap_loader.c
@@ -334,13 +339,17 @@ if(BUILD_wireshark)
 		merge.c
 		proto_hier_stats.c
 		summary.c
+		tempfile.c
 		${WIRESHARK_COMMON_SRC}
 	)
+	add_executable(wireshark ${wireshark_FILES})
+	target_link_libraries(wireshark ${wireshark_LIBS})
+	install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(BUILD_tshark)
 	set(tshark_LIBS
-		${LIBWIRESHARK_LIBS}
+		${LIBEPAN_LIBS}
 	)
 	set(tshark_FILES
 		capture_opts.c
@@ -358,7 +367,7 @@ endif()
 
 if(BUILD_rawshark)
 	set(rawshark_LIBS
-		${LIBWIRESHARK_LIBS}
+		${LIBEPAN_LIBS}
 	)
 	set(rawshark_FILES
 	        ${WIRESHARK_COMMON_SRC}
@@ -371,7 +380,7 @@ endif()
 
 if(BUILD_dftest)
 	set(dftest_LIBS
-		${LIBWIRESHARK_LIBS}
+		${LIBEPAN_LIBS}
 	)
 	set(dftest_FILES
 		dftest.c
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index c167025727..6118ac6543 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1141,7 +1141,7 @@ add_lemon_files(LIBWIRESHARK_FILES
 	dtd_grammar.lemon
 )
 
-add_library(wireshark SHARED
+add_library(epan SHARED
 	# Needed to trigger build of the include files for x11
 	x11-declarations.h
 	x11-register-info.h
@@ -1155,9 +1155,9 @@ add_library(wireshark SHARED
 	${DISSECTOR_ASM_UTILS}
 )
 
-add_dependencies(wireshark lemon)
+add_dependencies(epan lemon)
 
-install(TARGETS wireshark
+install(TARGETS epan
 	LIBRARY DESTINATION lib
 	RUNTIME DESTINATION lib
 	ARCHIVE DESTINATION lib
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index d39b4b56b2..a956f8273b 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -202,15 +202,20 @@ set(WIRESHARK_TAP_SRC
 
 ADD_CUSTOM_COMMAND(
 	OUTPUT wireshark-tap-register.c
-	COMMAND ${SHELL} ${CMAKE_SOURCE_DIR}/make-tapreg-dotc
-	  ${CMAKE_CURRENT_SOURCE_DIR} ${WIRESHARK_TAP_SRC}
+	COMMAND ${SHELL}
+	  ${CMAKE_SOURCE_DIR}/make-tapreg-dotc
+	  wireshark-tap-register.c
+	  ${CMAKE_CURRENT_SOURCE_DIR}
+	  ${WIRESHARK_TAP_SRC}
 	DEPENDS
-	  ${CMAKE_CURRENT_SOURCE_DIR}/make-tapreg-dotc
+	  ${CMAKE_SOURCE_DIR}/make-tapreg-dotc
 	  ${WIRESHARK_TAP_SRC}
 )
 
 add_library(ui SHARED
-	${WIRETAP_FILES}
+	${WIRESHARK_GTK_SRC}
+	${WIRESHARK_TAP_SRC}
+	wireshark-tap-register.c
 )
 
 install(TARGETS ui
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index ce4d658e36..63f274bfaf 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -79,8 +79,6 @@ add_yacc_files(WIRETAP_FILES
 	ascend.y
 )
 
-# add_dependency(ascend.c ascend_scanner_lex.h)
-
 add_library(wiretap SHARED
 	${WIRETAP_FILES}
 )