From eede89ec6da6283ab4e1dd1152401772dfa8ce0f Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 30 Oct 2012 17:39:04 +0000 Subject: [PATCH] Several bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@27247 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/functionparser/README | 2 +- deal.II/config/distclean.cmake.in | 2 +- deal.II/contrib/README.contrib | 13 +++++++++++++ deal.II/examples/CMakeLists.txt | 13 +++---------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/deal.II/bundled/functionparser/README b/deal.II/bundled/functionparser/README index b39c62b317..d275e78d72 100644 --- a/deal.II/bundled/functionparser/README +++ b/deal.II/bundled/functionparser/README @@ -1,6 +1,6 @@ This directory contains the functionparser project which is copyrighted by Juha Nieminen and licensed under the GNU Lesser General Public License -(LGPL) Version 3. See ./docs/fparser.html +(LGPL) Version 3. See ./docs/fparser.html or http://warp.povusers.org/FunctionParser/. A full version of the functionparser project can be downloaded at diff --git a/deal.II/config/distclean.cmake.in b/deal.II/config/distclean.cmake.in index 91beac77b6..0057d6a042 100644 --- a/deal.II/config/distclean.cmake.in +++ b/deal.II/config/distclean.cmake.in @@ -40,7 +40,7 @@ file(GLOB _files_to_remove ${CMAKE_BINARY_DIR}/examples/cmake_install.cmake ${CMAKE_BINARY_DIR}/examples/Makefile ${CMAKE_BINARY_DIR}/include/*/base/config.h - ${CMAKE_BINARY_DIR}/install_manifest.txt + ${CMAKE_BINARY_DIR}/install_manifest*.txt ${CMAKE_BINARY_DIR}/Makefile ${CMAKE_BINARY_DIR}/summary.log ) diff --git a/deal.II/contrib/README.contrib b/deal.II/contrib/README.contrib index 40b9c2bf37..8d1049c16e 100644 --- a/deal.II/contrib/README.contrib +++ b/deal.II/contrib/README.contrib @@ -5,6 +5,13 @@ deal.II AUTHORS, but are included by permission. For details, consult the stated licenses below. +lapack_templates +================ + +A small perl script for automatically generating lapack function +definitions. + + mesh_conversion =============== @@ -20,3 +27,9 @@ Is a program written by Martin Steigemann and Wolfgang Bangerth and licensed under the GNU Lesser General Public License (LGPL) Version 2.1 or later. See parameter_gui/README, parameter_gui/lgpl-2.1.txt. + +utilities +========= + +A collection of small programs for various purposes. + diff --git a/deal.II/examples/CMakeLists.txt b/deal.II/examples/CMakeLists.txt index c5ed4b4471..00c5543911 100644 --- a/deal.II/examples/CMakeLists.txt +++ b/deal.II/examples/CMakeLists.txt @@ -17,17 +17,10 @@ IF(DEAL_II_COMPONENT_EXAMPLES) # Add a rule on how to install the examples: # - SET(deal_ii_examples - step-1 step-2 step-3 step-4 step-5 step-6 step-7 step-8 step-9 - step-10 step-11 step-12 step-13 step-14 step-15 step-16 step-17 - step-18 step-19 step-20 step-21 step-22 step-23 step-24 step-25 - step-26 step-27 step-28 step-29 step-30 step-31 step-32 step-33 - step-34 step-35 step-36 step-37 step-38 step-39 step-40 step-41 - step-42 step-43 step-44 step-45 step-46 step-47 step-48 - ) + file(GLOB _steps ${CMAKE_CURRENT_SOURCE_DIR}/step-*) - FOREACH(step ${deal_ii_examples}) - INSTALL(DIRECTORY ${step} + FOREACH(_step ${_steps}) + INSTALL(DIRECTORY ${_step} DESTINATION ${DEAL_II_EXAMPLES_RELDIR} COMPONENT examples PATTERN ".svn" EXCLUDE -- 2.39.5