From f73ddfc8c56a35c4671a48dee89dff9f57dcb750 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 26 Sep 2012 07:54:44 +0000 Subject: [PATCH] Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@26744 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/config/Make.global_options.in | 110 +++----------------------- 1 file changed, 9 insertions(+), 101 deletions(-) diff --git a/deal.II/config/Make.global_options.in b/deal.II/config/Make.global_options.in index e81ec7f79e..14232e110b 100644 --- a/deal.II/config/Make.global_options.in +++ b/deal.II/config/Make.global_options.in @@ -10,33 +10,14 @@ ## This is a compatibility Make.global_options file generated by cmake ## from the ./config/Make.global_options.in file. ## +## TODO: ## This file exports several variables. They are documented in -## the file doc/development/makefiles.html. If you add a new -## variable, make sure it is documented in -## doc/development/makefiles.1.html and listed in -## doc/development/Makefile. +## the file doc/development/makefiles.html. +## ############################################################################### -###################################################################### -# Since most of our makefiles at some point use bash features, choose -# bash as default shell here once and for all -SHELL=/bin/bash - -# -# *** ISSUES *** -# -# - The link line "$(CXX) -o $@ $(LIBS) $(LDFLAGS)" -# of the examples is broken. LDFLAGS should be in front. -# So, we specify just one big blobb of ldflags and libraries (including -# deal.II) with corresponding RPATH flags in the LIBS variable # -# *** TODO *** -# -# - Update the online documentation -# - -###################################################### # the following lines will be replaced by cmake # @@ -44,27 +25,16 @@ D = @CMAKE_INSTALL_PREFIX@ CXX = @CMAKE_CXX_COMPILER@ CXX-ID = @CMAKE_CXX_COMPILER_ID@ CXX-VERSION = @CMAKE_CXX_COMPILER_VERSION@ -#GXX-VERSION -#GXX-VERSION-DETAILED -CC = @CMAKE_C_COMPILER@ -CC-ID = @CMAKE_C_COMPILER_ID@ -CC-VERSION = @CMAKE_C_COMPILER_VERSION@ #changed -#SHLIBLD -#SHLIBFLAGS -AR = @CMAKE_AR@ -RANLIB = @CMAKE_RANLIB@ LDFLAGS = # intentionally left empty and specified in LIBS -#F77 -#F77-VERSION -#F77LIBS + ifeq ($(debug-mode), on) LIBS = @MAKEFILE_LIBS_DEBUG@ else LIBS = @MAKEFILE_LIBS_RELEASE@ endif + LIBDIR = @CMAKE_INSTALL_PREFIX@/@DEAL_II_LIBRARY_RELDIR@ -#PERL -#QMAKE + enable-threads = @MAKEFILE_enablethreads@ enable-shared = @MAKEFILE_enableshared@ enable-parser = @MAKEFILE_enableparser@ @@ -72,77 +42,23 @@ DEAL_II_VERSION = @VERSION@ DEAL_II_MAJOR = @DEAL_II_VERSION_MAJOR@ DEAL_II_MINOR = @DEAL_II_VERSION_MINOR@ -# -# TODO: Reenable or remove -# +# TODO: CONTRIB is not really the correct wording... USE_CONTRIB_PETSC = @MAKEFILE_PETSC@ -DEAL_II_PETSC_DIR = @PETSC_DIR@ # TODO: Fix this! -DEAL_II_PETSC_ARCH = @PETSC_ARCH@ -DEAL_II_PETSC_VERSION_MAJOR = @PETSC_VERSION_MAJOR@ -DEAL_II_PETSC_VERSION_MINOR = @PETSC_VERSION_MINOR@ -DEAL_II_PETSC_VERSION_SUBMINOR = @PETSC_VERSION_SUBMINOR@ -DEAL_II_PETSC_VERSION_DEV = @MAKEFILE_PETSC_DEV@ -DEAL_II_PETSC_MPIUNI_LIB = @PETSC_LIBMPIUNI@ - -#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_SLEPC = @USE_CONTRIB_SLEPC@ USE_CONTRIB_TRILINOS = @MAKEFILE_TRILINOS@ -DEAL_II_TRILINOS_INCDIR = @TRILINOS_INCLUDE_DIRS@ # TODO: This will fail if there is more than one. -#DEAL_II_TRILINOS_LIBDIR = @DEAL_II_TRILINOS_LIBDIR@ # TODO -#DEAL_II_TRILINOS_SHARED = @DEAL_II_TRILINOS_SHARED@ # TODO -#DEAL_II_TRILINOS_STATIC = @DEAL_II_TRILINOS_STATIC@ # TODO -DEAL_II_TRILINOS_VERSION_MAJOR = @TRILINOS_VERSION_MAJOR@ -DEAL_II_TRILINOS_VERSION_MINOR = @TRILINOS_VERSION_MINOR@ -DEAL_II_TRILINOS_VERSION_SUBMINOR = @TRILINOS_VERSION_SUBMINOR@ -#DEAL_II_TRILINOS_LIBPREFIX = @DEAL_II_TRILINOS_LIBPREFIX@ # TODO - #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 = @MAKEFILE_BLAS@ USE_CONTRIB_LAPACK = @MAKEFILE_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 = @MAKEFILE_ARPACK@ -#DEAL_II_ARPACK_DIR = @DEAL_II_ARPACK_DIR@ # TODO -#DEAL_II_ARPACK_ARCH = @DEAL_II_ARPACK_ARCH@ # TODO - USE_CONTRIB_METIS = @USE_CONTRIB_METIS@ -#DEAL_II_METIS_DIR = @DEAL_II_METIS_DIR@ # TODO -#DEAL_II_METIS_LIBDIR = @DEAL_II_METIS_LIBDIR@ # TODO -#DEAL_II_METIS_INCDIR = @DEAL_II_METIS_INCDIR@ # TODO - -#USE_CONTRIB_HSL = @USE_CONTRIB_HSL@ - USE_CONTRIB_UMFPACK = @MAKEFILE_UMFPACK@ - USE_CONTRIB_P4EST = @MAKEFILE_P4EST@ -#DEAL_II_P4EST_DIR = @DEAL_II_P4EST_DIR@ # TODO -#DEAL_II_P4EST_LIBDIR_NAME = @DEAL_II_P4EST_LIBDIR_NAME@ # TODO - DEAL_II_USE_MPI = @MAKEFILE_MPI@ -TARGET = # TODO: Well, yes. - -###################################################### -# now configuration for compiler flags, paths, etc - OBJEXT = o # TODO: @CMAKE_CXX_OUTPUT_EXTENSION@ :-* -EXEEXT = # TODO +EXEEXT = # TODO # set paths to all the libraries we need: @@ -161,14 +77,6 @@ INCLUDE = ${MAKEFILE_INCLUDE_DIRS} CXXFLAGS.g = @CMAKE_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_DEBUG@ @MAKEFILE_DEFINITIONS@ @MAKEFILE_DEFINITIONS_DEBUG@ $(INCLUDE) CXXFLAGS.o = @CMAKE_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_RELEASE@ @MAKEFILE_DEFINITIONS@ @MAKEFILE_DEFINITIONS_RELEASE@ $(INCLUDE) -#F77FLAGS.g -#F77FLAGS.o - -# compile flags for C compiler -CFLAGS.g = @CMAKE_C_FLAGS@ @DEAL_II_C_FLAGS_DEBUG@ @MAKEFILE_DEFINITIONS@ @MAKEFILE_DEFINITIONS_DEBUG@ -CFLAGS.o = @CMAKE_C_FLAGS@ @DEAL_II_C_FLAGS_RELEASE@ @MAKEFILE_DEFINITIONS@ @MAKEFILE_DEFINITIONS_RELEASE@ - - ifeq ($(enable-threads),yes) MT = MT else -- 2.39.5