- Undo the PACKAGELIST WSWIN32 stuff in CMakeLists.txt:
That's what the packages are for, so instead of creating WSWIN32, the stuff should probably go into the GLIB2 package. - libwireshark now compiles - no time to add linking with it until tonight svn path=/trunk/; revision=29756
This commit is contained in:
Jörg Mayer
parent
7a413a615a
commit
9500e97cb3
|
|
@ -25,12 +25,6 @@ project(wireshark C)
|
|||
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
|
||||
subdirs(
|
||||
# epan
|
||||
wiretap
|
||||
wsutil
|
||||
)
|
||||
|
||||
#Where to find local cmake scripts
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
|
||||
INCLUDE(UseLemon)
|
||||
|
|
@ -47,8 +41,13 @@ include(CMakeInstallDirs)
|
|||
|
||||
include_directories(
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_BINARY_DIR}/epan
|
||||
${CMAKE_SOURCE_DIR}
|
||||
# ${CMAKE_SOURCE_DIR}/include
|
||||
${CMAKE_SOURCE_DIR}/epan
|
||||
${CMAKE_SOURCE_DIR}/epan/dfilter
|
||||
${CMAKE_SOURCE_DIR}/epan/dissectors
|
||||
${CMAKE_SOURCE_DIR}/epan/ftypes
|
||||
${CMAKE_SOURCE_DIR}/tools/lemon
|
||||
${CMAKE_SOURCE_DIR}/wiretap
|
||||
${CMAKE_SOURCE_DIR}/wsutil
|
||||
)
|
||||
|
|
@ -90,11 +89,7 @@ else()
|
|||
endif()
|
||||
|
||||
#The minimum package list
|
||||
if(WIN32)
|
||||
set(PACKAGELIST WSWIN32 LEX YACC Perl ${PACKAGELIST})
|
||||
else()
|
||||
set(PACKAGELIST GLIB2 PCAP LEX YACC Perl ${PACKAGELIST})
|
||||
endif()
|
||||
set(PACKAGELIST GLIB2 PCAP LEX YACC Perl PythonInterp HtmlViewer ${PACKAGELIST})
|
||||
|
||||
#Build the gui ?
|
||||
if(BUILD_wireshark)
|
||||
|
|
@ -104,7 +99,6 @@ endif()
|
|||
#Gnu asynchronous DNS
|
||||
if(ENABLE_ADNS)
|
||||
set(PACKAGELIST ADNS ${PACKAGELIST})
|
||||
set(HAVE_GNU_ADNS 1)
|
||||
endif()
|
||||
|
||||
set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
|
||||
|
|
@ -124,6 +118,11 @@ foreach(PACKAGE ${PACKAGELIST})
|
|||
endif()
|
||||
endforeach()
|
||||
|
||||
# Hack for now
|
||||
if(HAVE_LIBADNS)
|
||||
set(HAVE_GNU_ADNS 1)
|
||||
endif()
|
||||
|
||||
#packaging
|
||||
set(CPACK_PACKAGE_NAME wireshark)
|
||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "capture packet")
|
||||
|
|
@ -169,6 +168,10 @@ if(WIN32)
|
|||
endif()
|
||||
|
||||
|
||||
add_subdirectory( epan )
|
||||
add_subdirectory( wiretap )
|
||||
add_subdirectory( wsutil )
|
||||
|
||||
configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
|
||||
|
||||
link_directories(
|
||||
|
|
@ -180,8 +183,7 @@ link_directories(
|
|||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/svnversion.h
|
||||
COMMAND ${PERL} ${CMAKE_SOURCE_DIR}/make-version.pl
|
||||
ARGS
|
||||
${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}
|
||||
)
|
||||
SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/svnversion.h GENERATED)
|
||||
|
||||
|
|
|
|||
|
|
@ -42,17 +42,23 @@
|
|||
# ADNS_FOUND - True if adns found.
|
||||
|
||||
#Includes
|
||||
FIND_PATH(ADNS_INCLUDE_DIR adns.h
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
FIND_PATH(ADNS_INCLUDE_DIR
|
||||
NAMES
|
||||
adns.h
|
||||
PATHS
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
)
|
||||
|
||||
SET(ADNS_INCLUDE_DIRS ${ADNS_INCLUDE_DIR})
|
||||
|
||||
#Library
|
||||
FIND_LIBRARY(ADNS_LIBRARY
|
||||
NAMES adns
|
||||
PATHS /usr/lib /usr/local/lib
|
||||
NAMES
|
||||
adns
|
||||
PATHS
|
||||
/usr/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
|
||||
SET(ADNS_LIBRARIES ${ADNS_LIBRARY})
|
||||
|
|
@ -63,7 +69,17 @@ IF(ADNS_INCLUDE_DIR AND ADNS_LIBRARY)
|
|||
ENDIF(ADNS_INCLUDE_DIR AND ADNS_LIBRARY)
|
||||
|
||||
|
||||
if (ADNS_FOUND)
|
||||
if (NOT ADNS_FIND_QUIETLY)
|
||||
message(STATUS "Found ADNS: ${ADNS_LIBRARIES}")
|
||||
endif (NOT ADNS_FIND_QUIETLY)
|
||||
else (ADNS_FOUND)
|
||||
if (ADNS_FIND_REQUIRED)
|
||||
message(FATAL_ERROR "Could not find ADNS")
|
||||
endif (ADNS_FIND_REQUIRED)
|
||||
endif (ADNS_FOUND)
|
||||
|
||||
MARK_AS_ADVANCED(
|
||||
ADNS_LIBRARY
|
||||
ADNS_INCLUDE_DIR
|
||||
ADNS_LIBRARIES
|
||||
ADNS_INCLUDE_DIRS
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
# - Find an html viewer program
|
||||
#
|
||||
# HTML_VIEWER_EXECUTABLE - the full path to perl
|
||||
# HTML_VIEWER_FOUND - If false, don't attempt to use perl.
|
||||
|
||||
INCLUDE(FindCygwin)
|
||||
|
||||
FIND_PROGRAM(HTML_VIEWER_EXECUTABLE
|
||||
NAMES
|
||||
xdg-open
|
||||
mozilla
|
||||
htmlview
|
||||
PATHS
|
||||
${CYGWIN_INSTALL_PATH}/bin
|
||||
/bin
|
||||
/usr/bin
|
||||
/usr/local/bin
|
||||
/sbin
|
||||
)
|
||||
|
||||
IF (NOT HTML_VIEWER_EXECUTABLE)
|
||||
MESSAGE(FATAL_ERROR "HTML_VIEWER not found - aborting")
|
||||
ELSE ()
|
||||
SET (HTML_VIEWER_FOUND "YES")
|
||||
MESSAGE(STATUS "Found HTML_VIEWER: ${HTML_VIEWER_EXECUTABLE}")
|
||||
ENDIF ()
|
||||
|
||||
|
||||
# For compat with configure
|
||||
SET(HTML_VIEWER ${HTML_VIEWER_EXECUTABLE})
|
||||
|
||||
|
||||
MARK_AS_ADVANCED(HTML_VIEWER_EXECUTABLE)
|
||||
|
|
@ -43,10 +43,9 @@ MACRO(ADD_LEX_FILES _sources )
|
|||
OUTPUT ${_outc}
|
||||
# COMMAND ${LEX_EXECUTABLE}
|
||||
COMMAND ${CMAKE_SOURCE_DIR}/tools/runlex.sh ${LEX_EXECUTABLE}
|
||||
ARGS
|
||||
-o${_outc}
|
||||
--header-file=${_outh}
|
||||
${_in}
|
||||
-o${_outc}
|
||||
--header-file=${_outh}
|
||||
${_in}
|
||||
DEPENDS ${_in}
|
||||
)
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -40,11 +40,10 @@ MACRO(ADD_YACC_FILES _sources )
|
|||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${_out}
|
||||
COMMAND ${YACC_EXECUTABLE}
|
||||
ARGS
|
||||
-d
|
||||
-p ${_basename}
|
||||
-o${_out}
|
||||
${_in}
|
||||
-d
|
||||
-p ${_basename}
|
||||
-o${_out}
|
||||
${_in}
|
||||
DEPENDS ${_in}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -9,9 +9,8 @@ MACRO(ADD_LEMON_FILES _sources )
|
|||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${_out}
|
||||
COMMAND ${CMAKE_BINARY_DIR}/lemon
|
||||
ARGS
|
||||
t=${_lemonpardir}/lempar.c
|
||||
${srcdir}/${_in}
|
||||
t=${_lemonpardir}/lempar.c
|
||||
${srcdir}/${_in}
|
||||
DEPENDS ${_in}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,145 +0,0 @@
|
|||
###################################################################
|
||||
#
|
||||
# Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
|
||||
# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
|
||||
# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
|
||||
# All rights reserved.
|
||||
#
|
||||
###################################################################
|
||||
# - pkg-config module for CMake
|
||||
#
|
||||
# Defines the following macros:
|
||||
#
|
||||
# PKGCONFIG_FOUND(package found)
|
||||
# PKGCONFIG(package includedir libdir linkflags cflags)
|
||||
# PKGCONFIG_VERSION(package version)
|
||||
# PKGCONFIG_DEFINITION(package definition)
|
||||
|
||||
# Calling PKGCONFIG_FOUND will fill into the argument the value of the package search's result
|
||||
# e.g. PKGCONFIG_FOUND(libart-2.0 LIBART_FOUND)
|
||||
#
|
||||
# Calling PKGCONFIG_VERSION will fill the desired version into the argument,
|
||||
# e.g. PKGCONFIG_VERSION(libart-2.0 LIBART_VERSION)
|
||||
# Calling PKGCONFIG will fill the desired information into the 4 given arguments,
|
||||
# e.g. PKGCONFIG(libart-2.0 LIBART_INCLUDE_DIR LIBART_LINK_DIR LIBART_LINK_FLAGS LIBART_CFLAGS)
|
||||
# if pkg-config was NOT found or the specified software package doesn't exist, the
|
||||
# variable will be empty when the function returns, otherwise they will contain the respective information
|
||||
#
|
||||
# Calling PKGCONFIG_VERSION will fill the desired version into the argument,
|
||||
# e.g. PKGCONFIG_VERSION(libart-2.0 LIBART_VERSION)
|
||||
#
|
||||
# Calling PKGCONFIG_DEFINITION will fill the definition (e.g -D_REENTRANT) into the argument,
|
||||
# e.g. PKGCONFIG_DEFINITION(libart-2.0 LIBART_DEFINITION)
|
||||
|
||||
FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin )
|
||||
|
||||
MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
|
||||
# reset the variables at the beginning
|
||||
SET(${_include_DIR})
|
||||
SET(${_link_DIR})
|
||||
SET(${_link_FLAGS})
|
||||
SET(${_cflags})
|
||||
|
||||
# if pkg-config has been found
|
||||
IF(PKGCONFIG_EXECUTABLE)
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
|
||||
|
||||
# and if the package of interest also exists for pkg-config, then get the information
|
||||
IF(NOT _return_VALUE)
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} )
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR} )
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS} )
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} )
|
||||
|
||||
ENDIF(NOT _return_VALUE)
|
||||
|
||||
ENDIF(PKGCONFIG_EXECUTABLE)
|
||||
|
||||
ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
|
||||
|
||||
|
||||
|
||||
MACRO(PKGCONFIG_FOUND _package _pkgpath _found)
|
||||
# reset the variable at the beginning
|
||||
SET(${_found})
|
||||
|
||||
# if pkg-config has been found
|
||||
IF(PKGCONFIG_EXECUTABLE)
|
||||
SET(ENV{PKG_CONFIG_PATH} ${_pkgpath})
|
||||
EXECUTE_PROCESS(COMMAND ${PKGCONFIG_EXECUTABLE} --print-errors --exists ${_package} RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
|
||||
|
||||
IF(${_pkgconfigDevNull})
|
||||
MESSAGE(STATUS "${_pkgconfigDevNull}")
|
||||
ENDIF(${_pkgconfigDevNull})
|
||||
|
||||
IF(NOT _return_VALUE)
|
||||
SET(${_found} "TRUE")
|
||||
ENDIF(NOT _return_VALUE)
|
||||
ENDIF(PKGCONFIG_EXECUTABLE)
|
||||
|
||||
ENDMACRO(PKGCONFIG_FOUND _package _pkgpath _found)
|
||||
|
||||
|
||||
#TODO: doesn't work when pkgconfig returns multiples inlude path
|
||||
MACRO(PKGCONFIG_INCLUDE_DIRS _package _pkgpath _include_dirs)
|
||||
# reset the variable at the beginning
|
||||
SET(${_include_dirs})
|
||||
IF(PKGCONFIG_EXECUTABLE)
|
||||
SET(ENV{PKG_CONFIG_PATH} ${_pkgpath})
|
||||
EXECUTE_PROCESS(COMMAND ${PKGCONFIG_EXECUTABLE} --cflags-only-I ${_package} OUTPUT_VARIABLE include)
|
||||
STRING(REGEX REPLACE "-I/" "/" _include_dirs_temp ${include})
|
||||
STRING(REGEX REPLACE "[\n\r]" "" ${_include_dirs} ${_include_dirs_temp})
|
||||
#When the include directory is /usr/include, pkgconfig returns a space and a new line
|
||||
IF("${_include_dirs}" STREQUAL " ")
|
||||
SET(${_include_dirs} "/usr/include")
|
||||
ENDIF("${_include_dirs}" STREQUAL " ")
|
||||
ENDIF(PKGCONFIG_EXECUTABLE)
|
||||
ENDMACRO(PKGCONFIG_INCLUDE_DIRS _package _pkgpath _include_dirs)
|
||||
|
||||
MACRO(PKGCONFIG_LIBRARY_DIR _package _pkgpath _library_dir)
|
||||
# reset the variable at the beginning
|
||||
SET(${_library_dir})
|
||||
IF(PKGCONFIG_EXECUTABLE)
|
||||
SET(ENV{PKG_CONFIG_PATH} ${_pkgpath})
|
||||
EXECUTE_PROCESS(COMMAND ${PKGCONFIG_EXECUTABLE} --libs-only-L ${_package} OUTPUT_VARIABLE libraries)
|
||||
STRING(REGEX REPLACE "-L/" "/" _library_dirs_temp ${libraries})
|
||||
MESSAGE(STATUS "lib dir ${_library_dirs_temp} end")
|
||||
STRING(REGEX REPLACE "[\r\n]" "" ${_library_dir} ${_library_dirs_temp})
|
||||
#When the library directory is /usr/lib, pkgconfig returns an empty stringand a new line
|
||||
IF("${_library_dir}" STREQUAL " ")
|
||||
SET(${_library_dir} "/usr/lib")
|
||||
ENDIF("${_library_dir}" STREQUAL " ")
|
||||
MESSAGE(STATUS "lib dir ${${_library_dir}} end")
|
||||
ENDIF(PKGCONFIG_EXECUTABLE)
|
||||
ENDMACRO(PKGCONFIG_LIBRARY_DIR _package _pkgpath _library_dir)
|
||||
|
||||
MACRO(PKGCONFIG_VERSION _package _pkgpath _version)
|
||||
# reset the variable at the beginning
|
||||
SET(${_version})
|
||||
|
||||
IF(PKGCONFIG_EXECUTABLE)
|
||||
SET(ENV{PKG_CONFIG_PATH} ${_pkgpath})
|
||||
EXECUTE_PROCESS(COMMAND ${PKGCONFIG_EXECUTABLE} --modversion ${_package} OUTPUT_VARIABLE version)
|
||||
STRING(REGEX REPLACE "[\n\r]" "" ${_version} ${version})
|
||||
ENDIF(PKGCONFIG_EXECUTABLE)
|
||||
|
||||
ENDMACRO(PKGCONFIG_VERSION _package _pkgpath _version)
|
||||
|
||||
MACRO(PKGCONFIG_DEFINITION _package _pkgpath _definition)
|
||||
# reset the variable at the beginning
|
||||
SET(${_definition})
|
||||
|
||||
IF(PKGCONFIG_EXECUTABLE)
|
||||
SET(ENV{PKG_CONFIG_PATH} ${_pkgpath})
|
||||
EXECUTE_PROCESS(COMMAND ${PKGCONFIG_EXECUTABLE} --cflags-only-other ${_package} OUTPUT_VARIABLE definition)
|
||||
STRING(REGEX REPLACE "[\n\r]" "" ${_definition} ${definition})
|
||||
ENDIF(PKGCONFIG_EXECUTABLE)
|
||||
|
||||
ENDMACRO(PKGCONFIG_DEFINITION _package _pkgpath _definition)
|
||||
|
||||
MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
|
||||
1029
epan/CMakeLists.txt
1029
epan/CMakeLists.txt
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue