From 6d054230086a5de11d1af9f9550f61c08c89f1ee Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 4 Apr 2013 13:29:41 +0000 Subject: [PATCH] CMake: Some minor CPack tweaks git-svn-id: https://svn.dealii.org/trunk@29180 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/config/Config.cmake.in | 4 +++- deal.II/cmake/setup_cpack.cmake | 9 ++++++--- deal.II/cmake/setup_deal_ii.cmake | 9 ++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/deal.II/cmake/config/Config.cmake.in b/deal.II/cmake/config/Config.cmake.in index d78288128c..c28eb39495 100644 --- a/deal.II/cmake/config/Config.cmake.in +++ b/deal.II/cmake/config/Config.cmake.in @@ -26,10 +26,12 @@ SET(DEAL_II_PACKAGE_NAME "@DEAL_II_PACKAGE_NAME@") SET(DEAL_II_PACKAGE_VERSION "@DEAL_II_PACKAGE_VERSION@") +SET(DEAL_II_PACKAGE_VENDOR "@DEAL_II_PACKAGE_VENDOR@") +SET(DEAL_II_PACKAGE_DESCRIPTION "@DEAL_II_PACKAGE_DESCRIPTION@") -SET(DEAL_II_VERSION "@DEAL_II_VERSION@") SET(DEAL_II_VERSION_MAJOR "@DEAL_II_VERSION_MAJOR@") SET(DEAL_II_VERSION_MINOR "@DEAL_II_VERSION_MINOR@") +SET(DEAL_II_VERSION "@DEAL_II_VERSION@") SET(DEAL_II_PROJECT_CONFIG_NAME "@DEAL_II_PROJECT_CONFIG_NAME@") diff --git a/deal.II/cmake/setup_cpack.cmake b/deal.II/cmake/setup_cpack.cmake index c824a7d787..1e4d48e702 100644 --- a/deal.II/cmake/setup_cpack.cmake +++ b/deal.II/cmake/setup_cpack.cmake @@ -29,12 +29,15 @@ SET(CPACK_PACKAGE_VERSION "${DEAL_II_PACKAGE_VERSION}") SET(CPACK_PACKAGE_VERSION_MAJOR "${DEAL_II_VERSION_MAJOR}") SET(CPACK_PACKAGE_VERSION_MINOR "${DEAL_II_VERSION_MINOR}") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY - "Library for solving partial differential equations with the finite element method" - ) +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${DEAL_II_PACKAGE_DESCRIPTION}") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") +SET(CPACK_SOURCE_GENERATOR TGZ ZIP) # TBZ2 +SET(CPACK_SOURCE_IGNORE_FILES "/\\.svn/;\\.swp$;.*~$") + +SET(CPACK_GENERATOR TGZ TBZ2 ZIP) # TBZ2 + # # Generator specific configuration: # diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index 1242e13c00..d3a5e01b7a 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -27,6 +27,7 @@ # DEAL_II_PACKAGE_NAME *) # DEAL_II_PACKAGE_VERSION *) # DEAL_II_PACKAGE_VENDOR *) +# DEAL_II_PACKAGE_DESCRIPTION *) # DEAL_II_VERSION_MAJOR # DEAL_II_VERSION_MINOR # DEAL_II_VERSION @@ -64,7 +65,13 @@ SET_IF_EMPTY(DEAL_II_PACKAGE_NAME "deal.II") SET_IF_EMPTY(DEAL_II_PACKAGE_VERSION "8.0.pre") # TODO: Get this value from somewhere else -SET_IF_EMPTY(DEAL_II_PACKAGE_VENDOR "The deal.II Authors ") +SET_IF_EMPTY(DEAL_II_PACKAGE_VENDOR + "The deal.II Authors " + ) + +SET_IF_EMPTY(DEAL_II_PACKAGE_DESCRIPTION + "Library for solving partial differential equations with the finite element method" + ) STRING(REGEX REPLACE "^([0-9]+)\\..*" "\\1" DEAL_II_VERSION_MAJOR "${DEAL_II_PACKAGE_VERSION}" -- 2.39.5