diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2010-03-07 19:40:25 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2010-03-07 19:40:25 +0000 |
| commit | 6de362457d74eacc259088f3472511fbbef150fa (patch) | |
| tree | 401988aef9f4444ddc6fc6eb4ec9e90a619ee24f | |
| parent | ed5d503e5f8642da71585e715d219eb033d46230 (diff) | |
| download | wireshark-6de362457d74eacc259088f3472511fbbef150fa.tar.gz | |
- Derive Wireshark version from configure.in for now.
Allow to overide that version in CMakefile.txt
- Minor update to README.cmake
- Turn off GTK_DEBUG
svn path=/trunk/; revision=32139
| -rw-r--r-- | CMakeLists.txt | 40 | ||||
| -rw-r--r-- | CPackConfig.txt | 8 | ||||
| -rw-r--r-- | README.cmake | 4 |
3 files changed, 45 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9489e21ca0..568dc7b1f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,44 @@ project(Wireshark C) cmake_minimum_required(VERSION 2.6) set(CMAKE_BACKWARDS_COMPATIBILITY 2.6) +# set(PROJECT_VERSION "1.3.4-rc5") +# set(PROJECT_VERSION "1.3.4rc5") +# set(PROJECT_VERSION "1.3.4") +# If not set, copy over Wireshark version from configure.in AC_INIT +if(NOT PROJECT_VERSION) + file(STRINGS + ${CMAKE_SOURCE_DIR}/configure.in + VERSIONLINE + REGEX "\\(wireshark, .*\\)" + ) + string(REGEX REPLACE ".*\\(wireshark, (.*)\\).*" + "\\1" + PROJECT_VERSION + ${VERSIONLINE} + ) +endif() +string(REGEX REPLACE "([0-9]+)\\..*" + "\\1" + PROJECT_MAJOR_VERSION + ${PROJECT_VERSION} +) +string(REGEX REPLACE ".*\\.([0-9]+)\\..*" + "\\1" + PROJECT_MINOR_VERSION + ${PROJECT_VERSION} +) +string(REGEX REPLACE ".*\\..*\\.([0-9]+).*" + "\\1" + PROJECT_PATCH_VERSION + ${PROJECT_VERSION} +) +string(REGEX REPLACE ".*\\..*\\.[0-9]+(.*)" + "\\1" + PROJECT_VERSION_EXTENSION + ${PROJECT_VERSION} +) +message(STATUS "V: ${PROJECT_VERSION}, MaV: ${PROJECT_MAJOR_VERSION}, MiV: ${PROJECT_MINOR_VERSION}, PL: ${PROJECT_PATCH_VERSION}, EV: ${PROJECT_VERSION_EXTENSION}.") + #Where to find local cmake scripts set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) INCLUDE(UseLemon) @@ -197,7 +235,7 @@ set(PACKAGELIST GLIB2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGEL if(BUILD_wireshark) set(PACKAGELIST GTK2 ${PACKAGELIST}) set(GTK2_OPTIONS COMPONENTS gtk) - set(GTK2_DEBUG true) + set(GTK2_DEBUG false) endif() # SMI SNMP diff --git a/CPackConfig.txt b/CPackConfig.txt index 830e10a366..afb7f69698 100644 --- a/CPackConfig.txt +++ b/CPackConfig.txt @@ -26,10 +26,10 @@ 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 "1") -set(CPACK_PACKAGE_VERSION_MINOR "3") -set(CPACK_PACKAGE_VERSION_PATCH "3") -set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_MAJOR_VERSION}") +set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_MINOR_VERSION}") +set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}") +set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr") diff --git a/README.cmake b/README.cmake index d293e4c23d..7d1aeb062b 100644 --- a/README.cmake +++ b/README.cmake @@ -72,14 +72,14 @@ What works? =========== All the executables now build from clean source on: -* 32bit openSUSE 11.1 +* 32bit openSUSE 11.2 * 32bit Ubuntu 9.04 What needs to be done? ====================== - Add asn1 autogen target (assigned: krj) -- Redo glib2 and gtk2 find modules. +- Redo glib2 find modules. - Add back platform specific objects. - Fix places in the cmake files marked as todo. - Add back (working) install target. |