diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2010-03-04 23:35:43 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2010-03-04 23:35:43 +0000 |
| commit | ced2d1c4345011128fe04ef75603734de4dd5f71 (patch) | |
| tree | a4ce8b83b03d1013381897d92347d616e68cec3f /CMakeLists.txt | |
| parent | 2b619452ae9c00bf4b3058db2125023c80775db0 (diff) | |
Copy over the introduction of Makefile.common change
Replace FindGTK2 by version included in cmake 2.8.x
svn path=/trunk/; revision=32119
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ff34f23a9b..e2bb100969 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,6 +196,8 @@ set(PACKAGELIST GLIB2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGEL #Build the gui ? if(BUILD_wireshark) set(PACKAGELIST GTK2 ${PACKAGELIST}) + set(GTK2_OPTIONS COMPONENTS gtk) + set(GTK2_DEBUG true) endif() # SMI SNMP @@ -264,7 +266,11 @@ set(PROGLIST text2pcap mergecap capinfos editcap dumpcap) #Let's loop the package list foreach(PACKAGE ${PACKAGELIST}) - find_package(${PACKAGE} REQUIRED) + if(${PACKAGE}_OPTIONS) + find_package(${PACKAGE} ${${PACKAGE}_OPTIONS}) + else() + find_package(${PACKAGE} REQUIRED) + endif() message(${PACKAGE}_FOUND) if (${PACKAGE}_FOUND) set(HAVE_LIB${PACKAGE} 1) @@ -451,11 +457,15 @@ set(WTAP_PLUGIN_SOURCES epan/filesystem.c ) +set(SHARK_COMMON_CAPTURE_SRC + capture_errs.c + capture_ifinfo.c + capture_ui_utils.c +) + set(WIRESHARK_COMMON_SRC ${PLATFORM_SRC} - capture_errs.c capture-pcap-util.c - capture_ui_utils.c cfile.c clopts_common.c disabled_protos.c @@ -588,6 +598,7 @@ if(BUILD_wireshark) proto_hier_stats.c summary.c tempfile.c + ${SHARK_COMMON_CAPTURE_SRC} ${WIRESHARK_COMMON_SRC} ) add_executable(wireshark ${wireshark_FILES}) @@ -608,6 +619,7 @@ if(BUILD_tshark) tshark-tap-register.c tshark.c ${TSHARK_TAP_SRC} + ${SHARK_COMMON_CAPTURE_SRC} ${WIRESHARK_COMMON_SRC} ) add_executable(tshark ${tshark_FILES}) |