CMake: Some minor CPack tweaks

git-svn-id: https://svn.dealii.org/trunk@29180 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/config/Config.cmake.in b/deal.II/cmake/config/Config.cmake.in
index d78288128cc946fe19d19cf23663fdcbaab70375..c28eb394956ef89b11ee58218eb6cc96ebffc8a2 100644 (file)
--- 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 c824a7d787826fc81b615767bcfc07e89c663365..1e4d48e702e6d5d93446cc6b446e4057eb118690 100644 (file)
--- 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 1242e13c006571304a36b7d8584e57c5377ad5b2..d3a5e01b7a39afc1f0eec65ab58e54824e7cdca9 100644 (file)
--- 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 <http://www.dealii.org/>")
+SET_IF_EMPTY(DEAL_II_PACKAGE_VENDOR
+  "The deal.II Authors <http://www.dealii.org/>"
+  )
+
+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}"