diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-09-06 22:59:25 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-09-06 22:59:25 +0000 |
| commit | 7647b986b612a94391fde09f9ec531c42e737551 (patch) | |
| tree | d9c593e1ea1827ac7f3184aaffbcd0ffa9c93a9f /CMakeLists.txt | |
| parent | d6417e08422edab8aca35879e0fed4af48b09824 (diff) | |
The last update to FindGTK2.cmake was incompatible with it's use.
Fix a bug and adapt CMakeLists.txt to the new usage.
svn path=/trunk/; revision=19169
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c1a14ec5cb..286cb1ba13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,41 +61,39 @@ link_directories(wiretap) add_executable(dumpcap ${dumpcap_FILES}) option(BUILD_WITH_GLIB2 "Build using gtk2/glib2 instead of gtk/glib" ON) -option(BUILD_WIRESHARK "Build the GUI version of Wireshark" OFF) -option(ENABLE_STATIC "Build a static version of Wireshark" ON) +option(BUILD_WIRESHARK "Build the GUI version of Wireshark" ON) +option(ENABLE_STATIC "Build a static version of Wireshark" OFF) if (BUILD_WITH_GLIB2) if (BUILD_WIRESHARK) - find_package(GTK2) + find_package(GTK2 REQUIRED) if (GTK2_FOUND) message(GTK2_FOUND) include_directories(${GTK2_INCLUDE_DIR}) - set(dumpcap_LIBS ${dumpcap_LIBS} ${GTK2_LIBRARIES}) + # set(dumpcap_LIBS ${dumpcap_LIBS} ${GTK2_LIBRARIES}) endif (GTK2_FOUND) - else (BUILD_WIRESHARK) - find_package(GLIB2) - if (GLIB2_FOUND) - message(GLIB2_FOUND) - include_directories(${GLIB2_INCLUDE_DIR}) - set(dumpcap_LIBS ${dumpcap_LIBS} ${GLIB2_LIBRARIES}) - endif (GLIB2_FOUND) endif (BUILD_WIRESHARK) + find_package(GLIB2 REQUIRED) + if (GLIB2_FOUND) + message(GLIB2_FOUND) + include_directories(${GLIB2_INCLUDE_DIR}) + set(dumpcap_LIBS ${dumpcap_LIBS} ${GLIB2_glib_LIBRARY}) + endif (GLIB2_FOUND) else (BUILD_WITH_GLIB2) if (BUILD_WIRESHARK) - find_package(GTK) + find_package(GTK REQUIRED) if (GTK_FOUND) message(GTK_FOUND) include_directories(${GTK_INCLUDE_DIR}) - set(dumpcap_LIBS ${dumpcap_LIBS} ${GTK_LIBRARIES}) + # set(dumpcap_LIBS ${dumpcap_LIBS} ${GTK_LIBRARIES}) endif (GTK_FOUND) - else (BUILD_WIRESHARK) - find_package(GLIB REQUIRED) - if (GLIB_FOUND) - message(GLIB_FOUND) - include_directories(${GLIB_INCLUDE_DIR}) - set(dumpcap_LIBS ${dumpcap_LIBS} ${GLIB_LIBRARIES}) - endif (GLIB_FOUND) endif (BUILD_WIRESHARK) + find_package(GLIB REQUIRED) + if (GLIB_FOUND) + message(GLIB_FOUND) + include_directories(${GLIB_INCLUDE_DIR}) + set(dumpcap_LIBS ${dumpcap_LIBS} ${GLIB_glib_LIBRARIES}) + endif (GLIB_FOUND) endif (BUILD_WITH_GLIB2) set(PACKAGELIST ZLIB PCAP) |