diff options
| author | Sake Blok <sake@euronet.nl> | 2007-10-28 23:49:15 +0000 |
|---|---|---|
| committer | Sake Blok <sake@euronet.nl> | 2007-10-28 23:49:15 +0000 |
| commit | 5fe95468a2434e9fbef9dac21fc21dc4fffd2f7f (patch) | |
| tree | aadafdabb5f8247fb500864736976a8b03b2d87a /CMakeLists.txt | |
| parent | 81b41ba967caa2d0e45de0f8d6cc874cc9853bde (diff) | |
| download | wireshark-5fe95468a2434e9fbef9dac21fc21dc4fffd2f7f.tar.gz wireshark-5fe95468a2434e9fbef9dac21fc21dc4fffd2f7f.tar.bz2 wireshark-5fe95468a2434e9fbef9dac21fc21dc4fffd2f7f.zip | |
Bug 1227 : From Frederic Heem:
* modify CMakeInstallDirs.cmake according to cmake developper wishes
* FindDBUSGLIB.cmake fixes
* Add HAVE_CHOWN
* remove DBus from CMakeLists.txt.
* DBus support has its own application (capdbus) and is in a self contained directory. A separate patch will be provided
svn path=/trunk/; revision=23300
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f8299ce0b..918e03bd53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,8 +56,6 @@ option(BUILD_TSHARK "Build tshark" ON) option(BUILD_DUMPCAP "Build dumpcap" ON) option(ENABLE_STATIC "Build a static version of Wireshark" OFF) option(ENABLE_ADNS "Build with adns support" ON) -option(ENABLE_DBUS "Build with D-Bus support" OFF) -option(ENABLE_DBUS_TEST "Build with D-Bus unitest support" OFF) option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC" OFF) if(ENABLE_EXTRA_GCC_CHECKS) @@ -76,9 +74,8 @@ else(CMAKE_COMPILER_IS_GNUCC) add_definitions(-DHAVE_CONFIG_H -D_U_=\"\") endif(CMAKE_COMPILER_IS_GNUCC) -if(BUILD_WIRESHARK OR BUILD_TSHARK OR BUILD_DUMPCAP) - subdirs(wiretap) -endif(BUILD_WIRESHARK OR BUILD_TSHARK OR BUILD_DUMPCAP) + +subdirs(wiretap) #The minimum package list set(PACKAGELIST GLIB2 ZLIB PCAP ${PACKAGELIST}) @@ -94,13 +91,6 @@ if(ENABLE_ADNS) set(HAVE_GNU_ADNS 1) endif(ENABLE_ADNS) -#D-Bus -if(ENABLE_DBUS) - set(PACKAGELIST DBUS DBUSGLIB ${PACKAGELIST}) - subdirs(dbus) - set(dumpcap_LIBS ${dumpcap_LIBS} capdbus) -endif(ENABLE_DBUS) - #Let's loop the package list foreach(PACKAGE ${PACKAGELIST}) find_package(${PACKAGE} REQUIRED) @@ -114,6 +104,8 @@ foreach(PACKAGE ${PACKAGELIST}) endif (${PACKAGE}_FOUND) endforeach(PACKAGE) +#subdirs(dbus) + #packaging set(CPACK_PACKAGE_NAME wireshark) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "capture packet") @@ -167,6 +159,7 @@ check_include_file("unistd.h" HAVE_UNISTD_H) #Functions include(CheckFunctionExists) +check_function_exists("chown" HAVE_CHOWN) check_function_exists("gethostbyname2" HAVE_GETHOSTBYNAME2) check_function_exists("getprotobynumber" HAVE_GETPROTOBYNUMBER) check_function_exists("iconv" HAVE_ICONV) @@ -248,4 +241,3 @@ if(BUILD_DUMPCAP) install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}) endif(BUILD_DUMPCAP) - |