]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Restore the old Make.global_options.in
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Sep 2012 09:05:34 +0000 (09:05 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Sep 2012 09:05:34 +0000 (09:05 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26546 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/config/Make.global_options.in

index 92cb84e965ec32996b621e9889eacf379888dcbb..e057e07c0a6d419392904133fcec9fa9293dc7e9 100644 (file)
@@ -34,42 +34,26 @@ 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@
-
-#
-# TODO:
-# Come up with a way to decompose our full library paths to -L and -l and
-# provide them here:
-#
+F77                  = @F77@
+F77-VERSION          = @F77_VERSION@
+F77LIBS              = @F77LIBS@
 LIBS                 = @LIBS@
 LIBDIR               = $D/lib
-
-
-
-#
-#
-# TODO: The rest...
-#
-#
-
-
+PERL                 = @PERL@
+QMAKE                = @QMAKE@
 enable-threads       = @enablethreads@
 enable-shared        = @enableshared@
 enable-parser        = @enableparser@
-
-
 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@
@@ -78,11 +62,13 @@ 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@
@@ -92,26 +78,35 @@ 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.