]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Simplify a bit
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 27 Oct 2012 15:58:03 +0000 (15:58 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 27 Oct 2012 15:58:03 +0000 (15:58 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27228 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/bundled/README.bundled
deal.II/cmake/setup_custom_targets.cmake
deal.II/config.h.in.old [moved from deal.II/include/deal.II/base/config.h.in.old with 100% similarity]
deal.II/config/CMakeLists.txt
deal.II/config/distclean.cmake.in [moved from deal.II/cmake/distclean.cmake.in with 100% similarity]
deal.II/config/setup_template-arguments.in.cmake [deleted file]

index b6f46e992a46aca00a03af717acf8f40eea91259..14e7d9dbf648718876baf4de342f2f059508cd3c 100644 (file)
@@ -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)
 
 #
index 22171aa28ada027400cedf7eb8aedcc73ddc06a4..b197064855cf6636b733df2e163237d24250cfe8 100644 (file)
@@ -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
index 7f467f93453d7871a631c02e8a288de0c7d2b604..cab4fcf78e6ddd9df9ff5f86055b39e4a6761cda 100644 (file)
@@ -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
index c42c2c67e8078811e3c76cf74ad39812be868046..23662210804f336292d42c6e510452b36a78443a 100644 (file)
 #####
 
 
+#
+# 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/config/setup_template-arguments.in.cmake b/deal.II/config/setup_template-arguments.in.cmake
deleted file mode 100644 (file)
index 5dc1594..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#####
-##
-## Copyright (C) 2012 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>
-##
-#####
-
-
-CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/config/template-arguments.in
-  ${CMAKE_BINARY_DIR}/config/template-arguments
-  )
-

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.