diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2009-06-15 18:59:33 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2009-06-15 18:59:33 +0000 |
| commit | d3fcd1a09b43032c7b78cecd8d74bc49f31b9539 (patch) | |
| tree | d02fef752a7e308a04d528308ff711448c8626c7 /CMakeLists.txt | |
| parent | 0d300bb6f50a3c28adac30b1c09734975f2492cc (diff) | |
| download | wireshark-d3fcd1a09b43032c7b78cecd8d74bc49f31b9539.tar.gz wireshark-d3fcd1a09b43032c7b78cecd8d74bc49f31b9539.tar.bz2 wireshark-d3fcd1a09b43032c7b78cecd8d74bc49f31b9539.zip | |
CMake now successfully builds dumpcap
svn path=/trunk/; revision=28745
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f3e373c19..fae6081b62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,10 @@ project(wireshark C) -set(dumpcap_LIBS wiretap) +set(dumpcap_LIBS + wiretap + wsutil +) cmake_minimum_required(VERSION 2.6) @@ -45,6 +48,7 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/wiretap + ${CMAKE_SOURCE_DIR}/wsutil ) #Where to put libraries @@ -114,9 +118,9 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "capture packet") set(CPACK_PACKAGE_VENDOR "wireshark") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -set(CPACK_PACKAGE_VERSION_MAJOR "0") -set(CPACK_PACKAGE_VERSION_MINOR "99") -set(CPACK_PACKAGE_VERSION_PATCH "4") +set(CPACK_PACKAGE_VERSION_MAJOR "1") +set(CPACK_PACKAGE_VERSION_MINOR "3") +set(CPACK_PACKAGE_VERSION_PATCH "0") set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") @@ -212,7 +216,10 @@ endif(WIN32) configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h) -link_directories(wiretap) +link_directories( + wiretap + wsutil +) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_BINARY_DIR}/svnversion.h |