From 79c4a32a503acbc5ea7038313a6351b7b8d7db7a Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 9 Nov 2016 03:49:36 +0000 Subject: [PATCH] add CPU and build type to CPack package name Signed-off-by: Ivailo Monev --- CMakeLists.txt | 7 ++++--- cmake/modules/KatieBuildMacros.cmake | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fdffae69..d69228d34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,14 +27,15 @@ set(CPACK_PACKAGE_VENDOR "Katie") set(CPACK_PACKAGE_CONTACT "xakepa10@gmail.com") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README") # set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/Copyright.txt") -set(CPACK_PACKAGE_VERSION_MAJOR ${KATIE_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${KATIE_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${KATIE_MICRO}) +set(CPACK_PACKAGE_VERSION_MAJOR "4") +set(CPACK_PACKAGE_VERSION_MINOR "9") +set(CPACK_PACKAGE_VERSION_PATCH "0") set(CPACK_SET_DESTDIR TRUE) set(CPACK_SOURCE_IGNORE_FILES "/build/;/.git;${CPACK_SOURCE_IGNORE_FILES}") set(CPACK_STRIP_FILES TRUE) set(CPACK_GENERATOR "TXZ") set(CPACK_SOURCE_GENERATOR "TXZ") +set(CPACK_PACKAGE_FILE_NAME "Katie-4.9.0-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE}") include(CPack) # 9 minutes timeout for the tests, Travis timeouts on 10min if there is no diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 0518c3861..80cc4f28e 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -34,6 +34,8 @@ macro(KATIE_WARNING MESSAGESTR) endif() endmacro() +# a macro to create camel-case headers pointing to their lower-case alternative +# with a dev warning for possibly non-existent headers macro(KATIE_GENERATE_PUBLIC PUBLIC_INCLUDES SUBDIR) set(metaout ${CMAKE_BINARY_DIR}/include/${SUBDIR}/${SUBDIR}) set(metadata "#ifndef Qt${SUBDIR}_META_H\n#define Qt${SUBDIR}_META_H\n\n") @@ -100,11 +102,10 @@ macro(KATIE_GENERATE_PACKAGE FORTARGET REQUIRES) ) endmacro() -# the purpose of this function is to ensure that (1) the output string is not -# null so that when it is passed to another function/macro it does not complain -# about inproper number of arguments and (2) it joins the input which if quoted -# has semicolons in it (if it is a list) that the sub-command (e.g. gcc) can -# not handle. +# a function to ensure that (1) the output string is not null so that when it +# is passed to another function/macro it does not complain about inproper +# number of arguments and (2) it joins the input which if quoted has semicolons +# in it (if it is a list) that the sub-command (e.g. gcc) can not handle function(KATIE_FIXUP_STRING INSTR OUTSTR) string(STRIP "${INSTR}" instrtrimmed) if("${instrtrimmed}" STREQUAL "") -- 2.11.0