From 2b7aa8c4fc5425c4fae926005925b90ccae68d23 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 27 Oct 2012 15:58:03 +0000 Subject: [PATCH] Simplify a bit git-svn-id: https://svn.dealii.org/branches/branch_cmake@27228 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 20 ++++++--------- deal.II/bundled/README.bundled | 4 +-- deal.II/cmake/setup_custom_targets.cmake | 4 --- .../deal.II/base => }/config.h.in.old | 0 deal.II/config/CMakeLists.txt | 25 +++++++++++++++++++ deal.II/{cmake => config}/distclean.cmake.in | 0 .../config/setup_template-arguments.in.cmake | 20 --------------- 7 files changed, 34 insertions(+), 39 deletions(-) rename deal.II/{include/deal.II/base => }/config.h.in.old (100%) rename deal.II/{cmake => config}/distclean.cmake.in (100%) delete mode 100644 deal.II/config/setup_template-arguments.in.cmake diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index b6f46e992a..14e7d9dbf6 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -12,7 +12,6 @@ ## ##### - ## ## # # # The cmake build system for the deal.II project # @@ -118,29 +117,24 @@ INCLUDE(setup_finalize) # # ########################################################################### -# -# Build the toolchain and prepare the includes: -# -INCLUDE(config/setup_template-arguments.in.cmake) ADD_SUBDIRECTORY(scripts) + ADD_SUBDIRECTORY(include) -# -# Compile and install the library: -# IF(DEAL_II_WITH_BUNDLED_DIRECTORY) ADD_SUBDIRECTORY(bundled) ENDIF() + ADD_SUBDIRECTORY(source) -# -# Prepare the remaining directories for installation -# -ADD_SUBDIRECTORY(config) -ADD_SUBDIRECTORY(contrib) +ADD_SUBDIRECTORY(config) # has to be included after source + +ADD_SUBDIRECTORY(contrib) # has to be included after source + IF(DEAL_II_WITH_DOC_DIRECTORY) ADD_SUBDIRECTORY(doc) ENDIF() + ADD_SUBDIRECTORY(examples) # diff --git a/deal.II/bundled/README.bundled b/deal.II/bundled/README.bundled index 22171aa28a..b197064855 100644 --- a/deal.II/bundled/README.bundled +++ b/deal.II/bundled/README.bundled @@ -8,7 +8,7 @@ Below is a detailed list of the content of each subdirectory, and the licenses that apply. -boost-1.49.0 +./boost-1.49.0 ============ Contains parts of the boost c++ libraries copyrighted by the boost authors @@ -18,7 +18,7 @@ boost-1.49.0/LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt A full version of the library can be downloaded at http://www.boost.org/. -functionparser (FunctionParser 4.5) +./functionparser (FunctionParser 4.5) ============== Contains the FunctionParser project which is copyrighted by Juha Nieminen diff --git a/deal.II/cmake/setup_custom_targets.cmake b/deal.II/cmake/setup_custom_targets.cmake index 7f467f9345..cab4fcf78e 100644 --- a/deal.II/cmake/setup_custom_targets.cmake +++ b/deal.II/cmake/setup_custom_targets.cmake @@ -63,10 +63,6 @@ IF( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" AND # # Setup the "distclean" target: # - CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/cmake/distclean.cmake.in - ${CMAKE_BINARY_DIR}/distclean.cmake - @ONLY) ADD_CUSTOM_TARGET(distclean COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target clean COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/distclean.cmake diff --git a/deal.II/include/deal.II/base/config.h.in.old b/deal.II/config.h.in.old similarity index 100% rename from deal.II/include/deal.II/base/config.h.in.old rename to deal.II/config.h.in.old diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index c42c2c67e8..2366221080 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -13,6 +13,15 @@ ##### +# +# Configure the template-arguments file +# +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/template-arguments.in + ${CMAKE_CURRENT_BINARY_DIR}/template-arguments + ) + + ########################################################################### # # # Setup and install the convenience macros: # @@ -188,3 +197,19 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) ) ENDIF() + +########################################################################### +# # +# Configure distclean.cmake used by the autopilot 'distclean' target: # +# # +########################################################################### + + +IF( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" AND + NOT DISABLE_AUTOPILOT) + CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/cmake/distclean.cmake.in + ${CMAKE_BINARY_DIR}/distclean.cmake + @ONLY) +ENDIF() + diff --git a/deal.II/cmake/distclean.cmake.in b/deal.II/config/distclean.cmake.in similarity index 100% rename from deal.II/cmake/distclean.cmake.in rename to deal.II/config/distclean.cmake.in diff --git a/deal.II/config/setup_template-arguments.in.cmake b/deal.II/config/setup_template-arguments.in.cmake deleted file mode 100644 index 5dc15942d8..0000000000 --- a/deal.II/config/setup_template-arguments.in.cmake +++ /dev/null @@ -1,20 +0,0 @@ -##### -## -## Copyright (C) 2012 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 -## -##### - - -CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/config/template-arguments.in - ${CMAKE_BINARY_DIR}/config/template-arguments - ) - -- 2.39.5