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 /CPackConfig.txt | |
| parent | ed5d503e5f8642da71585e715d219eb033d46230 (diff) | |
| download | wireshark-6de362457d74eacc259088f3472511fbbef150fa.tar.gz wireshark-6de362457d74eacc259088f3472511fbbef150fa.tar.bz2 wireshark-6de362457d74eacc259088f3472511fbbef150fa.zip | |
- 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
Diffstat (limited to 'CPackConfig.txt')
| -rw-r--r-- | CPackConfig.txt | 8 |
1 files changed, 4 insertions, 4 deletions
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") |