From 7f903f5a686c88a16f174ba39b7d24e7b065efe8 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Fri, 29 Dec 2017 19:13:48 -0500 Subject: [PATCH] Added some initial CPack support. --- CMakeLists.txt | 30 +++++++++++++++++++++++------- model/Version.h.in | 10 +++++----- translations/glabels_C.ts | 6 +++--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 430535d..ce923e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.2) ############################################################################### # gLabels Label Designer Project ############################################################################### -project (glabels-qt) +project (glabels-qt VERSION "3.99.0") # # Path for locally defined cmake modules @@ -12,15 +12,31 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/" #======================================= -# Version Information +# Packaging and Version Information #======================================= -set (Website "http://glabels.org") +set (Website "glabels.org") +set (CPACK_PACKAGE_VENDOR ${Website}) -set (Major_Version "3") -set (Minor_Version "99") -set (Micro_Version "0") +set (CPACK_PACKAGE_NAME glabels) -set (Full_Version "${Major_Version}.${Minor_Version}.${Micro_Version}") +string (TIMESTAMP _date "%Y%m%d") +set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) +set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) +set (CPACK_PACKAGE_VERSION_TWEAK ${_date}) + +set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "gLabels Label Designer") +set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") + +set (CPACK_PACKAGE_EXECUTABLES "glabels-qt;gLabels") +set (CPACK_CREATE_DESKTOP_LINKS "glabels-qt") + +set (CPACK_NSIS_DISPLAY_NAME "gLabels") +set (CPACK_NSIS_URL_INFO_ABOUT "http://${Website}") +set (CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/glabels/windows-icon/glabels.ico") +set (CPACK_NSIS_MODIFY_PATH "ON") + +include (CPack) #======================================= diff --git a/model/Version.h.in b/model/Version.h.in index a4cf197..619658d 100644 --- a/model/Version.h.in +++ b/model/Version.h.in @@ -29,13 +29,13 @@ namespace glabels namespace Version { - const QString WEBSITE = "@Website@"; + const QString WEBSITE = "http://@Website@"; - const int MAJOR = @Major_Version@; - const int MINOR = @Minor_Version@; - const int MICRO = @Micro_Version@; + const int MAJOR = @glabels-qt_VERSION_MAJOR@; + const int MINOR = @glabels-qt_VERSION_MINOR@; + const int MICRO = @glabels-qt_VERSION_PATCH@; - const QString STRING = "@Full_Version@"; + const QString STRING = "@glabels-qt_VERSION@"; } } diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index 5bb228f..f08b66b 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -9,17 +9,17 @@ - + &License - + &Website - + &Close