From: maier Date: Thu, 28 Mar 2013 23:41:37 +0000 (+0000) Subject: CMake: Several bugfixes for CPack X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=579f703d796f13e079daa1e032f7a4c49083d1f7;p=dealii-svn.git CMake: Several bugfixes for CPack git-svn-id: https://svn.dealii.org/trunk@29108 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/README b/deal.II/README index c61eac5950..c82e565543 100644 --- a/deal.II/README +++ b/deal.II/README @@ -1,14 +1,27 @@ +What is deal.II? + + deal.II is a C++ program library targeted at the computational solution of + partial differential equations using adaptive finite elements. It uses + state-of-the-art programming techniques to offer you a modern interface to + the complex data structures and algorithms required. + For the impatient one: -Configure compile and install the deal.II library with: + Configure compile and install the deal.II library with: + + $ mkdir build + $ cd build + $ cmake -DCMAKE_INSTALL_PREFIX=/path/where/deal.II/should/be/intalled/to .. + $ make install (alternatively $ make -j install) + + A detailed ReadME can be found at ./doc/readme.html and + ./doc/development/cmake.html or at http://www.dealii.org/. + +Getting started: - $ mkdir build - $ cd build - $ cmake -DCMAKE_INSTALL_PREFIX=/path/where/deal.II/should/be/intalled/to .. - $ make install (alternatively $ make -j install) + The tutorial steps are located under ./examples + Information about the tutorial steps can be found at + ./doc/doxygen/tutorial/index.html or at http://www.dealii.org/. -A detailed ReadME can be found at - doc/readme.html and - doc/development/cmake.html -or at - http://dealii.org/. +For further information have a look at ./doc/readme.html or at +http://www.dealii.org. diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index e6195d3b96..9742ac9d84 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -40,7 +40,8 @@ # # DEAL_II_PATH *) # DEAL_II_CMAKE_MACROS_RELDIR *) -# DEAL_II_DOCUMENTATION_RELDIR *) +# DEAL_II_DOCHTML_RELDIR *) +# DEAL_II_DOCREADME_RELDIR *) # DEAL_II_EXAMPLES_RELDIR *) # DEAL_II_EXECUTABLE_RELDIR *) # DEAL_II_INCLUDE_RELDIR *) @@ -67,7 +68,7 @@ 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/") +SET_IF_EMPTY(DEAL_II_PACKAGE_VENDOR "The deal.II Authors ") STRING(REGEX REPLACE "^([0-9]+)\\..*" "\\1" DEAL_II_VERSION_MAJOR "${DEAL_II_PACKAGE_VERSION}" @@ -99,7 +100,8 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) # SET_IF_EMPTY(DEAL_II_CMAKE_MACROS_RELDIR "cmake/macros") SET_IF_EMPTY(DEAL_II_COMMON_RELDIR "common") - SET_IF_EMPTY(DEAL_II_DOCUMENTATION_RELDIR "doc") + SET_IF_EMPTY(DEAL_II_DOCREADME_RELDIR "") + SET_IF_EMPTY(DEAL_II_DOCHTML_RELDIR "doc") SET_IF_EMPTY(DEAL_II_EXAMPLES_RELDIR "examples") SET_IF_EMPTY(DEAL_II_EXECUTABLE_RELDIR "bin") SET_IF_EMPTY(DEAL_II_INCLUDE_RELDIR "include") @@ -112,7 +114,8 @@ ELSE() # SET_IF_EMPTY(DEAL_II_CMAKE_MACROS_RELDIR "share/${DEAL_II_PACKAGE_NAME}/cmake/Macros") SET_IF_EMPTY(DEAL_II_COMMON_RELDIR "share/${DEAL_II_PACKAGE_NAME}/common") - SET_IF_EMPTY(DEAL_II_DOCUMENTATION_RELDIR "share/doc/${DEAL_II_PACKAGE_NAME}/html") + SET_IF_EMPTY(DEAL_II_DOCREADME_RELDIR "share/doc/${DEAL_II_PACKAGE_NAME}") + SET_IF_EMPTY(DEAL_II_DOCHTML_RELDIR "${DEAL_II_DOCREADME_RELDIR}/html") SET_IF_EMPTY(DEAL_II_EXAMPLES_RELDIR "share/doc/${DEAL_II_PACKAGE_NAME}/examples") SET_IF_EMPTY(DEAL_II_EXECUTABLE_RELDIR "bin") SET_IF_EMPTY(DEAL_II_INCLUDE_RELDIR "include") diff --git a/deal.II/doc/CMakeLists.txt b/deal.II/doc/CMakeLists.txt index fd7d788e0e..0ebd34ef88 100644 --- a/deal.II/doc/CMakeLists.txt +++ b/deal.II/doc/CMakeLists.txt @@ -48,7 +48,7 @@ IF(DEAL_II_COMPONENT_DOCUMENTATION) # Install the static elements of the html documentation: # INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ - DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR} + DESTINATION ${DEAL_II_DOCHTML_RELDIR} COMPONENT documentation PATTERN "CMakeLists.txt" EXCLUDE PATTERN "doxygen" EXCLUDE @@ -61,9 +61,19 @@ IF(DEAL_II_COMPONENT_DOCUMENTATION) ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/title.html - DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR} + DESTINATION ${DEAL_II_DOCHTML_RELDIR} COMPONENT documentation ) ENDIF(DEAL_II_COMPONENT_DOCUMENTATION) +# +# Always install a minimalistic README and LICENSE file: +# +SET(_destination) +INSTALL(FILES + ${CMAKE_SOURCE_DIR}/README + ${CMAKE_SOURCE_DIR}/LICENSE + DESTINATION ${CMAKE_INSTALL_PREFIX}/${DEAL_II_DOCREADME_RELDIR} + COMPONENT library + ) diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample index dac9a7c2dc..a1d5d62e89 100644 --- a/deal.II/doc/development/Config.sample +++ b/deal.II/doc/development/Config.sample @@ -25,7 +25,7 @@ # ) # # SET(DEAL_II_COMPONENT_DOCUMENTATION OFF CACHE BOOL -# "Enable configuration, build and installation of the documentation. This adds a COMPONENT \"documentation\" to the build system." +# "Enable configuration, build and installation of the html documentation. This adds a COMPONENT \"documentation\" to the build system." # ) # # SET(DEAL_II_COMPONENT_EXAMPLES ON CACHE BOOL @@ -573,10 +573,14 @@ # "Relative installation directory for macros" # ) # -# SET(DEAL_II_DOCUMENTATION_RELDIR "doc" CACHE STRING +# SET(DEAL_II_DOCHTML_RELDIR "doc" CACHE STRING # "Relative installation directory for html documentation" # ) # +# SET(DEAL_II_DOCREADME_RELDIR "" CACHE STRING +# "Relative installation directory for readme" +# ) +# # SET(DEAL_II_EXAMPLES_RELDIR "examples" CACHE STRING # "Relative installation directory for examples" # ) diff --git a/deal.II/doc/doxygen/CMakeLists.txt b/deal.II/doc/doxygen/CMakeLists.txt index 3b777bb71d..fbb13e8f2c 100644 --- a/deal.II/doc/doxygen/CMakeLists.txt +++ b/deal.II/doc/doxygen/CMakeLists.txt @@ -95,13 +95,13 @@ ADD_CUSTOM_TARGET(doxygen ALL INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css - DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR}/doxygen + DESTINATION ${DEAL_II_DOCHTML_RELDIR}/doxygen COMPONENT documentation ) INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/deal.II - DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR}/doxygen + DESTINATION ${DEAL_II_DOCHTML_RELDIR}/doxygen COMPONENT documentation ) diff --git a/deal.II/doc/doxygen/tutorial/CMakeLists.txt b/deal.II/doc/doxygen/tutorial/CMakeLists.txt index a4d7c2e974..cde334966d 100644 --- a/deal.II/doc/doxygen/tutorial/CMakeLists.txt +++ b/deal.II/doc/doxygen/tutorial/CMakeLists.txt @@ -197,7 +197,7 @@ INSTALL(FILES toc-topics.html ${CMAKE_CURRENT_BINARY_DIR}/steps.png ${CMAKE_CURRENT_BINARY_DIR}/toc.html - DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR}/doxygen/tutorial + DESTINATION ${DEAL_II_DOCHTML_RELDIR}/doxygen/tutorial COMPONENT documentation )