osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jörg Mayer 2006-09-06 22:59:25 +00:00
parent d6417e0842
commit 7647b986b6
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CMakeLists.txt
View File

@ -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)

4
cmake/modules/FindGTK2.cmake
View File

@ -286,7 +286,9 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
${GTK2_LIBRARIES}
${GTK2_GTHREAD_LIBRARY}
)
SET(GTK2_LIBRARIES ${GTK2_LIBRARIES} CACHE INTERNAL "The libraries for GTK2"
SET(GTK2_LIBRARIES ${GTK2_LIBRARIES}
CACHE INTERNAL "The libraries for GTK2"
)
ENDIF(GTK2_GTHREAD_LIBRARY)
ELSE(GTK2_CAIRO_INCLUDE_PATH)
MESSAGE(STATUS "Can not find cairo")