From 7cc0e4892636efc7a189c8e429254dc6d0f252b4 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Thu, 8 Oct 2009 23:18:18 +0000 Subject: 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 --- qpid/cpp/CMakeLists.txt | 12 +++++------- qpid/cpp/packaging/NSIS/qpid-install-banner.bmp | Bin 7342 -> 9742 bytes qpid/cpp/packaging/NSIS/qpid-install-banner.png | Bin 0 -> 57218 bytes 3 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 qpid/cpp/packaging/NSIS/qpid-install-banner.png (limited to 'qpid/cpp') 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) diff --git a/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp b/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp index e12c2e97c9..1dac04c685 100644 Binary files a/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp and b/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp differ diff --git a/qpid/cpp/packaging/NSIS/qpid-install-banner.png b/qpid/cpp/packaging/NSIS/qpid-install-banner.png new file mode 100644 index 0000000000..be70d02ee6 Binary files /dev/null and b/qpid/cpp/packaging/NSIS/qpid-install-banner.png differ -- cgit v1.2.1