diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-10-08 23:18:18 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-10-08 23:18:18 +0000 |
| commit | 7cc0e4892636efc7a189c8e429254dc6d0f252b4 (patch) | |
| tree | f9b8f47f30b20ac5228e04c11f413c3238aa48d1 /qpid/cpp/CMakeLists.txt | |
| parent | a6574349fcab64146bb9842456627c1753252e67 (diff) | |
| download | qpid-python-7cc0e4892636efc7a189c8e429254dc6d0f252b4.tar.gz | |
Fix package name and NSIS banner bitmap size.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@823356 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index 8f04a21e51..18a7616d99 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -38,8 +38,6 @@ include (CTest) # # This section also has all the setup for various packaging-specific options. if (WIN32) - - set (CPACK_PACKAGE_INSTALL_DIRECTORY "Qpid ${qpidc_version}") set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") set (CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/NSIS\\\\qpid-icon.ico") set (CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/NSIS\\\\qpid-icon.ico") @@ -162,13 +160,13 @@ add_subdirectory(src) # add_subdirectory(docs/man) add_subdirectory(examples) -set(CPACK_PACKAGE_NAME "Qpid") +set(CPACK_PACKAGE_NAME "qpid-cpp") set(CPACK_PACKAGE_VENDOR "Apache Software Foundation") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache Qpid C++") -set(CPACK_PACKAGE_VERSION "0.6.0") -set(CPACK_PACKAGE_VERSION_MAJOR "0") -set(CPACK_PACKAGE_VERSION_MINOR "6") +set(CPACK_PACKAGE_VERSION "${qpidc_version}") +set(CPACK_PACKAGE_VERSION_MAJOR "${QPID_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${QPID_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "0") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "qpidc-0.6") +set(CPACK_PACKAGE_INSTALL_DIRECTORY "qpidc-${qpidc_version}") include (CPack) |