diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-08-05 18:52:53 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-08-05 18:52:53 +0000 |
| commit | 15d5c762fe8606d26486f132421132cda0dd55e8 (patch) | |
| tree | e97058fe16cc1546c908085e1178e4348087a30b /cmake | |
| parent | f85b5a17499a18c694805afce1f24ab8e515a72f (diff) | |
FindGTK2: Add a check for pangocairo. It has to be linked explicitly, at
least for MacPorts.
FindPCAP: Define HAVE_PCAP_CREATE if we have pcap_create.
svn path=/trunk/; revision=38372
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGTK2.cmake | 3 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index 01e1fb6312..fca4a938a5 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -459,6 +459,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h) _GTK2_FIND_LIBRARY (GTK2_PANGO_LIBRARY pango false true) + _GTK2_FIND_LIBRARY (GTK2_PANGOCAIRO_LIBRARY pangocairo false true) + _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h) _GTK2_FIND_LIBRARY (GTK2_ATK_LIBRARY atk false true) @@ -594,4 +596,3 @@ endif() if(GTK2_INCLUDE_DIRS) list(REMOVE_DUPLICATES GTK2_INCLUDE_DIRS) endif() - diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 7edcb882b2..1d3c1b6c0d 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -111,15 +111,16 @@ CHECK_FUNCTION_EXISTS("pcap_freecode" HAVE_PCAP_FREECODE) # update libpcap without updating the headers. # CHECK_FUNCTION_EXISTS("pcap_breakloop" HAVE_PCAP_BREAKLOOP) -CHECK_FUNCTION_EXISTS("pcap_findalldevs" HAVE_PCAP_FINDALLDEVS) -CHECK_FUNCTION_EXISTS("pcap_datalink_val_to_name" HAVE_PCAP_DATALINK_VAL_TO_NAME) +CHECK_FUNCTION_EXISTS("pcap_create" HAVE_PCAP_CREATE) CHECK_FUNCTION_EXISTS("pcap_datalink_name_to_val" HAVE_PCAP_DATALINK_NAME_TO_VAL) CHECK_FUNCTION_EXISTS("pcap_datalink_val_to_description" HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION) +CHECK_FUNCTION_EXISTS("pcap_datalink_val_to_name" HAVE_PCAP_DATALINK_VAL_TO_NAME) +CHECK_FUNCTION_EXISTS("pcap_findalldevs" HAVE_PCAP_FINDALLDEVS) +CHECK_FUNCTION_EXISTS("pcap_free_datalinks" HAVE_PCAP_FREE_DATALINKS) +CHECK_FUNCTION_EXISTS("pcap_get_selectable_fd" HAVE_PCAP_GET_SELECTABLE_FD) +CHECK_FUNCTION_EXISTS("pcap_lib_version" HAVE_PCAP_LIB_VERSION) CHECK_FUNCTION_EXISTS("pcap_list_datalinks" HAVE_PCAP_LIST_DATALINKS) CHECK_FUNCTION_EXISTS("pcap_set_datalink" HAVE_PCAP_SET_DATALINK) -CHECK_FUNCTION_EXISTS("pcap_lib_version" HAVE_PCAP_LIB_VERSION) -CHECK_FUNCTION_EXISTS("pcap_get_selectable_fd" HAVE_PCAP_GET_SELECTABLE_FD) -CHECK_FUNCTION_EXISTS("pcap_free_datalinks" HAVE_PCAP_FREE_DATALINKS) # Remote pcap checks CHECK_FUNCTION_EXISTS("pcap_open" H_PCAP_OPEN) CHECK_FUNCTION_EXISTS("pcap_findalldevs_ex" H_FINDALLDEVS_EX) |