]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
CMake: Add support for CPack
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 28 Mar 2013 15:48:29 +0000 (15:48 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 28 Mar 2013 15:48:29 +0000 (15:48 +0000)
git-svn-id: https://svn.dealii.org/trunk@29100 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/LICENSE [new file with mode: 0644]
deal.II/cmake/config/Config.cmake.in
deal.II/cmake/setup_cpack.cmake [new file with mode: 0644]
deal.II/cmake/setup_deal_ii.cmake

index b665897d70faaaadb86129e7303c8652a97fcd94..9892558cc29d3bf354e5f803bf752c0612c4d124 100644 (file)
@@ -135,6 +135,11 @@ ADD_SUBDIRECTORY(examples)
 #
 INCLUDE(setup_custom_targets)
 
+#
+# Include CPack configuration:
+#
+INCLUDE(setup_cpack)
+
 #
 # And finally, print the configuration:
 #
diff --git a/deal.II/LICENSE b/deal.II/LICENSE
new file mode 100644 (file)
index 0000000..01fb68d
--- /dev/null
@@ -0,0 +1 @@
+# Stub for the new license
index 46bed777e82c539b79843844e3b82abf9e4918f0..d15fb2fc1264206f321c49228d0006836d4da5f3 100644 (file)
@@ -41,7 +41,6 @@ SET(DEAL_II_BUILD_TYPES "@DEAL_II_BUILD_TYPES@")
 # Information about the project location
 #
 
-SET(DEAL_II_PATH "@DEAL_II_PATH@")
 SET(DEAL_II_CMAKE_MACROS_RELDIR "@DEAL_II_CMAKE_MACROS_RELDIR@")
 SET(DEAL_II_COMMON_RELDIR "@DEAL_II_COMMON_RELDIR@")
 SET(DEAL_II_DOCUMENTATION_RELDIR "@DEAL_II_DOCUMENTATION_RELDIR@")
@@ -51,6 +50,13 @@ SET(DEAL_II_INCLUDE_RELDIR "@DEAL_II_INCLUDE_RELDIR@")
 SET(DEAL_II_LIBRARY_RELDIR "@DEAL_II_LIBRARY_RELDIR@")
 SET(DEAL_II_PROJECT_CONFIG_RELDIR "@DEAL_II_PROJECT_CONFIG_RELDIR@")
 
+#
+# Determine DEAL_II_PATH from CMAKE_CURRENT_LIST_DIR:
+#
+STRING(REGEX REPLACE
+  "/@DEAL_II_PROJECT_CONFIG_RELDIR@$" ""
+  DEAL_II_PATH "${CMAKE_CURRENT_LIST_DIR}"
+  )
 
 #
 # Print a message after inclusion of this file:
diff --git a/deal.II/cmake/setup_cpack.cmake b/deal.II/cmake/setup_cpack.cmake
new file mode 100644 (file)
index 0000000..c824a7d
--- /dev/null
@@ -0,0 +1,45 @@
+#####
+##
+## Copyright (C) 2013 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## <TODO: Full License information>
+## This file is dual licensed under QPL 1.0 and LGPL 2.1 or any later
+## version of the LGPL license.
+##
+## Author: Matthias Maier <matthias.maier@iwr.uni-heidelberg.de>
+##
+#####
+
+#
+#
+###########################################################################
+#                                                                         #
+#                              Setup cpack:                               #
+#                                                                         #
+###########################################################################
+
+#
+# General setup:
+#
+SET(CPACK_PACKAGE_NAME "${DEAL_II_PACKAGE_NAME}")
+SET(CPACK_PACKAGE_VENDOR "${DEAL_II_PACKAGE_VENDOR}")
+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_FILE "${CMAKE_SOURCE_DIR}/README")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+
+#
+# Generator specific configuration:
+#
+
+# TODO
+
+#INCLUDE(InstallRequiredSystemLibraries)
+INCLUDE(CPack)
index 110af8706d3d82b0d6c988025c33104ec75e66f8..e6195d3b96e19c2b3c0c141d8a03d64b0de93f5a 100644 (file)
@@ -26,6 +26,7 @@
 #
 #     DEAL_II_PACKAGE_NAME            *)
 #     DEAL_II_PACKAGE_VERSION         *)
+#     DEAL_II_PACKAGE_VENDOR          *)
 #     DEAL_II_VERSION_MAJOR
 #     DEAL_II_VERSION_MINOR
 #     DEAL_II_VERSION
@@ -66,6 +67,8 @@ 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 "http://www.dealii.org/")
+
 STRING(REGEX REPLACE
   "^([0-9]+)\\..*" "\\1" DEAL_II_VERSION_MAJOR "${DEAL_II_PACKAGE_VERSION}"
   )

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.