]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 1 Oct 2012 13:16:23 +0000 (13:16 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 1 Oct 2012 13:16:23 +0000 (13:16 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26903 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/README.CMAKE
deal.II/TODO.CMAKE
deal.II/cmake/configure/configure_trilinos.cmake
deal.II/cmake/configure/configure_zlib.cmake
deal.II/cmake/setup_custom_targets.cmake
deal.II/cmake/setup_deal_ii.cmake
deal.II/contrib/CMakeLists.txt [new file with mode: 0644]
deal.II/contrib/mesh_conversion/CMakeLists.txt [new file with mode: 0644]
deal.II/contrib/mesh_conversion/Makefile [deleted file]
deal.II/contrib/parameter_gui/CMakeLists.txt [new file with mode: 0644]

index fc3311629c5e55a8758beeaa52e6ea25fce03bf7..24b272b31758e6fe3d3f57c8fb5bac96b13a781c 100644 (file)
@@ -122,6 +122,7 @@ IF(DEAL_II_WITH_DOC_DIRECTORY)
   ADD_SUBDIRECTORY(doc)
 ENDIF()
 ADD_SUBDIRECTORY(examples)
+ADD_SUBDIRECTORY(contrib)
 
 #
 # Define some custom targets for convenience
index fc1f05fc7e056b9fa0c902f58ba329a1048080a4..255d218eb8e8b95fcf7b2acbd617999a97e7ceba 100644 (file)
@@ -297,6 +297,10 @@ CONFIGURATION
   The following options control which components of deal.II will be
   configured, build and installed:
 
+    DEAL_II_COMPONENT_CONTRIB
+      Enable configuration and installation of the programs under contrib
+      This adds a COMPONENT "contrib" to the build system.
+
     DEAL_II_COMPONENT_COMPAT_FILES:
       Enable installation of legacy files and tools for compatibility with
       the old build system
@@ -310,10 +314,6 @@ CONFIGURATION
       Enable configuration and installation of the example steps.
       This adds a COMPONENT "examples" to the build system.
 
-    DEAL_II_COMPONENT_CONTRIB
-      Enable configuration and installation of the programs under contrib
-      This adds a COMPONENT "contrib" to the build system.
-
 
 
 
index 44209195789128a4e15df2c58ec5db0f90a27cb6..564a9d2285ceff420c4728bc495585e9a89eed77 100644 (file)
@@ -27,6 +27,13 @@ Major:
 
 * Port the testsuite to cmake
 
+* Build system for parameter_gui.
+
+* Finish install targets:
+
+   - share files (documentation/manpage/etc.)
+   - same for mesh_conversion and parameter_gui
+
 * Rename all DEAL_II_USE_* and HAVE_LIB* that refer to a feature to
   DEAL_II_WITH_*.
 
index 29039553ef644c7f4c218d729e39f8cf32e29cea..91dd3ce14754c7dec9222598845aab02d3cd3abb 100644 (file)
@@ -16,7 +16,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     #
     SET(${var} TRUE)
 
-
     #
     # Check whether all required modules of trilinos are installed:
     #
@@ -46,7 +45,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
         )
     ENDIF()
 
-
     #
     # Trilinos 10.6 had quite a number of bugs we ran into, see
     # for example
@@ -62,7 +60,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       SET(${var} FALSE)
     ENDIF()
 
-
     #
     # The same is unfortunately true for 10.8.[01]:
     #   https://software.sandia.gov/bugzilla/show_bug.cgi?id=5370
@@ -78,7 +75,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       SET(${var} FALSE)
     ENDIF()
 
-
     #
     # Trilinos has to be configured with the same MPI configuration as
     # deal.II.
@@ -100,7 +96,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       SET(${var} FALSE)
     ENDIF()
 
-
     #
     # Some verions of Sacado_cmath.hpp does things that aren't compatible
     # with the -std=c++0x flag of GCC, see deal.II FAQ.
index f0e4f3f81b1f2156afb91bb55f248c1f6e6c367d..d9fe051c8026ccd6d2c459160bf632b7d02f7a91 100644 (file)
@@ -2,6 +2,10 @@
 # Configuration for the zlib library:
 #
 
+OPTION(DEAL_II_WITH_ZLIB
+  "Build deal.II with support for zlib."
+  OFF)
+
 MACRO(FEATURE_ZLIB_FIND_EXTERNAL var)
   FIND_PACKAGE(ZLIB)
 
index 7cfd2be836c0527f5fd958ef3f8244446930bab1..ed33d63399dc797f604a34c3bab370afbc1b0877 100644 (file)
@@ -17,30 +17,24 @@ FOREACH(build ${DEAL_II_BUILD_TYPES})
   ADD_DEPENDENCIES(library ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX})
 ENDFOREACH()
 
-
 IF(DEAL_II_COMPONENT_DOCUMENTATION)
-
   ADD_CUSTOM_TARGET(documentation)
   ADD_DEPENDENCIES(documentation doxygen)
-
 ENDIF()
 
-
-IF(DEAL_II_COMPONENT_COMPAT_FILES)
-
+IF(DEAL_II_COMPONENT_COMPAT_FILES) 
   ADD_CUSTOM_TARGET(compat_files)
   ADD_DEPENDENCIES(compat_files
     expand_instantiations
     make_dependencies
     report_features
     )
-
 ENDIF()
 
-
-IF(DEAL_II_COMPONENT_PROJECT_CONFIG)
-
-  ADD_CUSTOM_TARGET(project_config)
-
+IF(DEAL_II_COMPONENT_CONTRIB) 
+  ADD_CUSTOM_TARGET(contrib)
+  ADD_DEPENDENCIES(contrib
+    mesh_conversion
+    )
 ENDIF()
 
index 7815e7e63316b91ddea2b2e0f77a42e9c22d816b..ab48a06d2b456ce962508a70ff0552b7d523b080 100644 (file)
@@ -10,6 +10,7 @@
 #     DEAL_II_ALLOW_BUNDLED           **)
 #     DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS **)
 #     DEAL_II_COMPONENT_COMPAT_FILES  **)
+#     DEAL_II_COMPONENT_CONTRIB       **)
 #     DEAL_II_COMPONENT_DOCUMENTATION **)
 #     DEAL_II_COMPONENT_EXAMPLES      **)
 #
@@ -105,6 +106,11 @@ OPTION(DEAL_II_COMPONENT_COMPAT_FILES
   ON
   )
 
+OPTION(DEAL_II_COMPONENT_CONTRIB
+  "Enable installation of contrib packages. This adds a COMPONENT \"contrib\" to the build system."
+  ON
+  )
+
 OPTION(DEAL_II_COMPONENT_EXAMPLES
   "Enable configuration and installation of the example steps. This adds a COMPONENT \"examples\" to the build system."
   ON
diff --git a/deal.II/contrib/CMakeLists.txt b/deal.II/contrib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fe91b60
--- /dev/null
@@ -0,0 +1,4 @@
+IF(DEAL_II_COMPONENT_CONTRIB)
+  ADD_SUBDIRECTORY(mesh_conversion)
+  ADD_SUBDIRECTorY(parameter_gui)
+ENDIF()
diff --git a/deal.II/contrib/mesh_conversion/CMakeLists.txt b/deal.II/contrib/mesh_conversion/CMakeLists.txt
new file mode 100644 (file)
index 0000000..477b261
--- /dev/null
@@ -0,0 +1,11 @@
+ADD_EXECUTABLE(mesh_conversion
+  Main.cc
+  MeshConversion.cc
+  )
+
+INSTALL(TARGETS mesh_conversion
+  RUNTIME
+  DESTINATION ${DEAL_II_EXECUTABLE_RELDIR}
+  COMPONENT contrib
+  )
+
diff --git a/deal.II/contrib/mesh_conversion/Makefile b/deal.II/contrib/mesh_conversion/Makefile
deleted file mode 100755 (executable)
index 319087f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-SHELL = /bin/sh
-
-#MACROS
-CPP = g++ -g -ansi -pedantic -Wall
-PROG = convert_mesh
-
-#SUFFIX RULES
-.SUFFIXES: .o .cc
-.cc.o:
-       $(CPP) -c $<
-
-all: $(PROG)
-
-$(PROG): Main.o MeshConversion.o
-       $(CPP)  -o      $(PROG) Main.o MeshConversion.o
-Main.o:        Main.cc         MeshConversion.o
-MeshConversion.o:      MeshConversion.cc
-
-clean:
-       @echo "-------------------------------------------------"
-       @echo "REMOVING EXECUTABLES, *.o, a.out AND FILE BACKUPS"
-       -rm -f  ${PROG} *.o *.*~ makefile~ *~
-       @echo "-------------------------------------------------"
-
-clean-temp:
-       @echo "-------------------------------------------------"
-       @echo "REMOVING EXECUTABLES, *.o, a.out AND FILE BACKUPS"
-       -rm -f  *.o *.*~ makefile~ *~
-       @echo "-------------------------------------------------"
diff --git a/deal.II/contrib/parameter_gui/CMakeLists.txt b/deal.II/contrib/parameter_gui/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e69de29

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.