From b5242611a5dd99624173ba44e76251c14b168a65 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 31 Jan 2020 13:49:16 -0500 Subject: [PATCH] Minor packaging cleanup --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bd0568c..03398433 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -268,16 +268,18 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND EXISTS "${CMAKE_CURRENT_SOURCE_D add_subdirectory(book) endif() -# Packaging support # Packaging support set(CPACK_PACKAGE_VENDOR "github.com/CLIUtils/CLI11") set(CPACK_PACKAGE_CONTACT "https://${CPACK_PACKAGE_VENDOR}") -set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) +set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) # Automatic in CMake 3.12+ +set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) # Automatic in CMake 3.12+ +set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) # Automatic in CMake 3.12+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Command line parser with simple and intuitive interface") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.CPack.Description.txt") set(CPACK_SOURCE_GENERATOR "TGZ;ZIP") + # CPack collects *everything* except what's listed here. set(CPACK_SOURCE_IGNORE_FILES /.git @@ -299,9 +301,9 @@ set(CPACK_SOURCE_IGNORE_FILES /.pre-commit.*yaml ) -set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all") set(CPACK_DEBIAN_COMPRESSION_TYPE "xz") set(CPACK_DEBIAN_PACKAGE_NAME "libcli11-dev") + include(CPack)