]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 14:08:33 +0000 (14:08 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 14:08:33 +0000 (14:08 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26595 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/cmake/macros/macro_expand_instantiations.cmake
deal.II/cmake/setup_custom_targets.cmake [new file with mode: 0644]

index e6c7e6c1e8f069031f6ce700360d7297d60cbfda..b8f06454279965fd9549011bdec7b3c0919b7575 100644 (file)
@@ -91,11 +91,16 @@ SET(VERSION "8.0.pre")
 #   $ cmake -DCMAKE_CXX_FLAGS="-Wno-sign-compare" <...>
 #
 #
-# Build optoins: TODO
+# Build options:
 #
-# - BUILD_SHARED_LIBS and DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS
+# - BUILD_SHARED_LIBS and
+# - DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS
 #
-# Installation: TODO
+# Installation:
+#
+# - DEAL_II_INSTALL_EXAMPLES
+# - DEAL_II_INSTALL_COMPAT_FILES
+# - DEAL_II_INSTALL_PROJECT_CONFIG
 #
 # - Explain Components and Options...
 # - Explain how to build and install only a specific component:
@@ -233,6 +238,8 @@ OPTION(DEAL_II_INSTALL_PROJECT_CONFIG
   ON)
 
 
+
+
 ###########################################################################
 #                                                                         #
 #                             Configuration:                              #
@@ -397,3 +404,7 @@ ADD_SUBDIRECTORY(config)
 ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(examples)
 
+#
+# Define some convencience custom targets for easy use:
+#
+INCLUDE(setup_custom_targets)
index d4084e5cb931532edf11e3e2f05be911b0118126..cb2f60e11ed3e35542f24f5639b0ae75572356c9 100644 (file)
@@ -25,7 +25,7 @@ MACRO(macro_expand_instantiations target inst_in_files)
       DEPENDS expand_instantiations
               ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file}
       COMMAND expand_instantiations
-      ARGS ${CMAKE_BINARY_DIR}/contrib/config/template-arguments
+      ARGS ${CMAKE_BINARY_DIR}/config/template-arguments
            < ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file}
            > ${CMAKE_CURRENT_BINARY_DIR}/${inst_file}
       )
diff --git a/deal.II/cmake/setup_custom_targets.cmake b/deal.II/cmake/setup_custom_targets.cmake
new file mode 100644 (file)
index 0000000..30fcba9
--- /dev/null
@@ -0,0 +1,36 @@
+
+#
+# Setup some convenience custom targets for the build system:
+#
+
+#
+# Custom targets for building all targets necessary to install a specific
+# component. (Too bad, we have to do this by hand. There is no cmake
+# internal way to do this, yet...)
+#
+
+ADD_CUSTOM_TARGET(library)
+ADD_DEPENDENCIES(library deal_II)
+
+
+IF(DEAL_II_WITH_DOXYGEN)
+
+  ADD_CUSTOM_TARGET(documentation)
+  ADD_DEPENDENCIES(documentation doxygen)
+
+ENDIF()
+
+
+IF(DEAL_II_INSTALL_COMPAT_FILES)
+
+  ADD_CUSTOM_TARGET(compat_files)
+
+ENDIF()
+
+
+IF(DEAL_II_INSTALL_PROJECT_CONFIG)
+
+  ADD_CUSTOM_TARGET(project_config)
+
+ENDIF()
+

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.