From 942859472fcc28bb2de69ccb9ed7fefd89766b29 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 22 Sep 2012 15:14:44 +0000 Subject: [PATCH] Roundup git-svn-id: https://svn.dealii.org/branches/branch_cmake@26633 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/config/CMakeLists.txt | 10 +++++++++- deal.II/include/deal.II/base/config.h.in | 12 ++++------- deal.II/include/deal.II/base/config.h.in.old | 21 -------------------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index 7517c25a4f..1a38b90670 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -71,7 +71,6 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) LIST(APPEND MAKEFILE_LIBS ${lib}) ENDFOREACH() TO_STRING(MAKEFILE_LIBS ${MAKEFILE_LIBS}) - # # Put our linker flags directly in front of this string: # @@ -79,6 +78,15 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) "${CMAKE_SHARED_LINKER_FLAGS} ${MAKEFILE_LIBS}" ) + IF(DEAL_II_WITH_TBB) + SET(MAKEFILE_enablethreads "yes") + ENDIF() + IF(DEAL_II_WITH_FUNCTIONPARSER) + SET(MAKEFILE_enableparser "yes") + ENDIF() + IF(BUILD_SHARED_LIBS) + SET(MAKEFILE_enableshared "yes") + ENDIF() CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index da8ea1512b..e4424dc568 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -1,15 +1,12 @@ -//---------------------------- config.h --------------------------- +//---------------------------- config.h.in --------------------------- // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors +// Copyright (C) 2012 by the deal.II authors // -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. +// TODO: Header // -//---------------------------- config.h --------------------------- +//---------------------------- config.h.in --------------------------- #ifndef __deal2__config_h #define __deal2__config_h @@ -52,7 +49,6 @@ - /***************************************** * Configured in configure_arpack.cmake: * *****************************************/ diff --git a/deal.II/include/deal.II/base/config.h.in.old b/deal.II/include/deal.II/base/config.h.in.old index ead5e6739a..76c7d2c68a 100644 --- a/deal.II/include/deal.II/base/config.h.in.old +++ b/deal.II/include/deal.II/base/config.h.in.old @@ -269,9 +269,6 @@ then of course isn't valid any more. See mails in early Feb 2006. */ #cmakedefine PETSC_SKIP_UNDERSCORE_CHKERR -/* Define to 1 if you have the ANSI C header files. */ -#cmakedefine STDC_HEADERS - /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD @@ -304,24 +301,6 @@ # endif #endif -/* - * There is an annoying problem in the Trilinos header ml_config.h: It - * #define's HAVE_INTTYPES_H but doesn't give the symbol a value. This - * conflicts with the result of running deal.II's ./configure which - * #define's it and gives it the value "1". The result is a compiler - * warning. So if we use Trilinos and if the symbol is already - * #define'd, then #cmakedefine it again here. deal.II doesn't use the - * #define anyway and this way if we include any of the Trilinos - * headers they can feel free to set it again to whatever they wish. - * - * The form of the #cmakedefine with the comment in the middle is necessary - * to avoid that the pattern substitution of ./configure turns the - * #cmakedefine into a #define again. - */ -#if defined(DEAL_II_USE_TRILINOS) && defined(HAVE_INTTYPES_H) -# undef /* */ HAVE_INTTYPES_H -#endif - /** * These macros are defined to make testing for PETSc versions within * the deal.II main code as simple as possible. In brief they are used -- 2.39.5