From 0baeb96cc62d0b0570389e5508fd5423bc9d1162 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 28 Mar 2013 15:48:29 +0000 Subject: [PATCH] CMake: Add support for CPack git-svn-id: https://svn.dealii.org/trunk@29100 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 5 ++++ deal.II/LICENSE | 1 + deal.II/cmake/config/Config.cmake.in | 8 ++++- deal.II/cmake/setup_cpack.cmake | 45 ++++++++++++++++++++++++++++ deal.II/cmake/setup_deal_ii.cmake | 3 ++ 5 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 deal.II/LICENSE create mode 100644 deal.II/cmake/setup_cpack.cmake diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index b665897d70..9892558cc2 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -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 index 0000000000..01fb68d1cd --- /dev/null +++ b/deal.II/LICENSE @@ -0,0 +1 @@ +# Stub for the new license diff --git a/deal.II/cmake/config/Config.cmake.in b/deal.II/cmake/config/Config.cmake.in index 46bed777e8..d15fb2fc12 100644 --- a/deal.II/cmake/config/Config.cmake.in +++ b/deal.II/cmake/config/Config.cmake.in @@ -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 index 0000000000..c824a7d787 --- /dev/null +++ b/deal.II/cmake/setup_cpack.cmake @@ -0,0 +1,45 @@ +##### +## +## Copyright (C) 2013 by the deal.II authors +## +## This file is part of the deal.II library. +## +## +## This file is dual licensed under QPL 1.0 and LGPL 2.1 or any later +## version of the LGPL license. +## +## Author: Matthias Maier +## +##### + +# +# +########################################################################### +# # +# 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) diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index 110af8706d..e6195d3b96 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -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}" ) -- 2.39.5