]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
compat_files component written
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Sep 2012 16:01:57 +0000 (16:01 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Sep 2012 16:01:57 +0000 (16:01 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26513 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/cmake-TODO
deal.II/contrib/config/CMakeLists.txt
deal.II/contrib/config/Make.global_options.in [moved from deal.II/common/Make.global_options.in with 94% similarity]
deal.II/contrib/config/Make.rules [moved from deal.II/common/Make.rules with 100% similarity]
deal.II/contrib/config/Version.in [moved from deal.II/Version.in with 100% similarity]

index dfed6794d6c649b8940b6e28894744555e1e0f40..438483893006cd45e91a2b89920ff51b79748451 100644 (file)
@@ -216,9 +216,9 @@ OPTION(DEAL_II_INSTALL_EXAMPLES
   This feature adds a COMPONENT \"examples\" to the build system."
   ON)
 
-OPTION(DEAL_II_INSTALL_COMPATIBILITY_FILES
+OPTION(DEAL_II_INSTALL_COMPAT_FILES
   "Enable the installation of the example steps.
-  This feature adds a COMPONENT \"compatibility_files\" to the build system."
+  This feature adds a COMPONENT \"compat_files\" to the build system."
   ON)
 
 
index 12adabe17f7074b19434e00914aba150eb7530f2..27660399ae095be375d753c8404d6695be1f3ed0 100644 (file)
@@ -2,8 +2,6 @@ TODO:
 
 * Add build and installation of the documentation
 
-* Write the compatibility_files COMPONENT.
-
 * The original decision to have a dedicated p4est/FAST and p4est/DEBUG
   structure is a bit unfortunate and therefor replaced by a FindP4EST
   module that searches libp4est.so and treats this as FAST and
index bbdbc3916608a921e83982cff3ffe845ba77f099..fdb88a67723c28ab751da827b65805a82b73f123 100644 (file)
@@ -2,3 +2,35 @@ CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/template-arguments.in
   ${CMAKE_CURRENT_BINARY_DIR}/template-arguments
   )
+
+
+IF(DEAL_II_INSTALL_COMPAT_FILES)
+
+  #
+  # Configure and install the old Makefile configuration:
+  #
+
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in
+    ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options
+    )
+
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Version.in
+    ${CMAKE_CURRENT_BINARY_DIR}/Version
+    )
+
+  INSTALL(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/template-arguments
+    ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options
+    DESTINATION common
+    COMPONENT compat_files
+    )
+
+  INSTALL(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/Version
+    DESTINATION ${CMAKE_INSTALL_PREFIX}
+    COMPONENT compat_files
+    )
+
+ENDIF()
similarity index 94%
rename from deal.II/common/Make.global_options.in
rename to deal.II/contrib/config/Make.global_options.in
index 159d16c66d83b74effc3e13406ccba5b5f4dd87b..92cb84e965ec32996b621e9889eacf379888dcbb 100644 (file)
@@ -26,32 +26,50 @@ SHELL=/bin/bash
 # the following lines will be replaced by the output
 # of ./configure
 
-D                    = @prefix@
-CXX                  = @CXX@
-GXX-VERSION          = @GXX_VERSION@
-GXX-VERSION-DETAILED = @GXX_VERSION_DETAILED@
-CC                   = @CC@
-CC-VERSION           = @CC_VERSION@
+D                    = @CMAKE_INSTALL_PREFIX@
+
+CXX                  = @CMAKE_CXX_COMPILER@
+CXX-ID               = @CMAKE_CXX_COMPILER_ID@
+CXX-VERSION          = @CMAKE_CXX_COMPILER_VERSION@
+CC                   = @CMAKE_C_COMPILER@
+CC-ID                = @CMAKE_C_COMPILER_ID@
+CC-VERSION           = @CMAKE_C_COMPILER_VERSION@
+
+#
+# TODO:
+#
 SHLIBLD              = @SHLIBLD@
 SHLIBFLAGS           = @SHLIBFLAGS@
 AR                   = @AR@
 RANLIB               = @RANLIB@
 LDFLAGS              = @LDFLAGS@
-F77                  = @F77@
-F77-VERSION          = @F77_VERSION@
-F77LIBS              = @F77LIBS@
+
+#
+# TODO:
+# Come up with a way to decompose our full library paths to -L and -l and
+# provide them here:
+#
 LIBS                 = @LIBS@
 LIBDIR               = $D/lib
-PERL                 = @PERL@
-QMAKE                = @QMAKE@
+
+
+
+#
+#
+# TODO: The rest...
+#
+#
+
+
 enable-threads       = @enablethreads@
 enable-shared        = @enableshared@
 enable-parser        = @enableparser@
-DEAL_II_VERSION      = @PACKAGE_VERSION@
+
+
+DEAL_II_VERSION      = @VERSION@
 DEAL_II_MAJOR        = @DEAL_II_MAJOR@
 DEAL_II_MINOR        = @DEAL_II_MINOR@
 
-USE_CONTRIB_PETSC    = @USE_CONTRIB_PETSC@
 DEAL_II_PETSC_DIR    = @DEAL_II_PETSC_DIR@
 DEAL_II_PETSC_ARCH   = @DEAL_II_PETSC_ARCH@
 DEAL_II_PETSC_VERSION_MAJOR    = @DEAL_II_PETSC_VERSION_MAJOR@
@@ -60,13 +78,11 @@ DEAL_II_PETSC_VERSION_SUBMINOR = @DEAL_II_PETSC_VERSION_SUBMINOR@
 DEAL_II_PETSC_VERSION_DEV      = @DEAL_II_PETSC_VERSION_DEV@
 DEAL_II_PETSC_MPIUNI_LIB       = @DEAL_II_PETSC_MPIUNI_LIB@
 
-USE_CONTRIB_SLEPC    = @USE_CONTRIB_SLEPC@
 DEAL_II_SLEPC_DIR    = @DEAL_II_SLEPC_DIR@
 DEAL_II_SLEPC_VERSION_MAJOR    = @DEAL_II_SLEPC_VERSION_MAJOR@
 DEAL_II_SLEPC_VERSION_MINOR    = @DEAL_II_SLEPC_VERSION_MINOR@
 DEAL_II_SLEPC_VERSION_SUBMINOR = @DEAL_II_SLEPC_VERSION_SUBMINOR@
 
-USE_CONTRIB_TRILINOS = @USE_CONTRIB_TRILINOS@
 DEAL_II_TRILINOS_INCDIR = @DEAL_II_TRILINOS_INCDIR@
 DEAL_II_TRILINOS_LIBDIR = @DEAL_II_TRILINOS_LIBDIR@
 DEAL_II_TRILINOS_SHARED = @DEAL_II_TRILINOS_SHARED@
@@ -76,35 +92,26 @@ DEAL_II_TRILINOS_VERSION_MINOR    = @DEAL_II_TRILINOS_VERSION_MINOR@
 DEAL_II_TRILINOS_VERSION_SUBMINOR = @DEAL_II_TRILINOS_VERSION_SUBMINOR@
 DEAL_II_TRILINOS_LIBPREFIX = @DEAL_II_TRILINOS_LIBPREFIX@
 
-USE_CONTRIB_HDF5 = @USE_CONTRIB_HDF5@
 DEAL_II_HDF5_VERSION = @DEAL_II_HDF5_VERSION@
 DEAL_II_HDF5_CFLAGS = @DEAL_II_HDF5_CFLAGS@
 DEAL_II_HDF5_CPPFLAGS = @DEAL_II_HDF5_CPPFLAGS@
 DEAL_II_HDF5_LDFLAGS = @DEAL_II_HDF5_LDFLAGS@
 DEAL_II_HDF5_INCDIR = @DEAL_II_HDF5_INCDIR@
 
-USE_CONTRIB_BLAS   = @USE_CONTRIB_BLAS@
-USE_CONTRIB_LAPACK = @USE_CONTRIB_LAPACK@
-
-USE_CONTRIB_MUMPS  = @USE_CONTRIB_MUMPS@
 DEAL_II_MUMPS_DIR  = @DEAL_II_MUMPS_DIR@
 DEAL_II_SCALAPACK_DIR = @DEAL_II_SCALAPACK_DIR@
 DEAL_II_BLACS_DIR  = @DEAL_II_BLACS_DIR@
 DEAL_II_BLACS_ARCH = @DEAL_II_BLACS_ARCH@
 
-USE_CONTRIB_ARPACK  = @USE_CONTRIB_ARPACK@
 DEAL_II_ARPACK_DIR  = @DEAL_II_ARPACK_DIR@
 DEAL_II_ARPACK_ARCH = @DEAL_II_ARPACK_ARCH@
 
-USE_CONTRIB_METIS    = @USE_CONTRIB_METIS@
 DEAL_II_METIS_DIR = @DEAL_II_METIS_DIR@
 DEAL_II_METIS_LIBDIR = @DEAL_II_METIS_LIBDIR@
 DEAL_II_METIS_INCDIR = @DEAL_II_METIS_INCDIR@
 
-USE_CONTRIB_HSL      = @USE_CONTRIB_HSL@
 USE_CONTRIB_UMFPACK  = @USE_CONTRIB_UMFPACK@
 
-USE_CONTRIB_P4EST    = @USE_CONTRIB_P4EST@
 DEAL_II_P4EST_DIR    = @DEAL_II_P4EST_DIR@
 DEAL_II_P4EST_LIBDIR_NAME = @DEAL_II_P4EST_LIBDIR_NAME@
 

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.