From e5c5513f7b0566700f816c8884a5076cfd986e79 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 24 Sep 2012 15:56:34 +0000 Subject: [PATCH] Bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26672 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_petsc.cmake | 2 +- deal.II/include/deal.II/base/config.h.in | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake index 21024c2b94..67bbe8a503 100644 --- a/deal.II/cmake/configure/configure_petsc.cmake +++ b/deal.II/cmake/configure/configure_petsc.cmake @@ -64,7 +64,7 @@ MACRO(FEATURE_PETSC_CONFIGURE_EXTERNAL var) # a completely obnoxious way with boost. # TODO: Obosolete? # - ADD_DEFINITIONS(-DPETSC_SKIP_UNDERSCORE_CHKERR) + SET(PETSC_SKIP_UNDERSCORE_CHKERR TRUE) # # Set some definitions for config.h: diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index a4c45ea683..dcdee6361e 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -223,11 +223,9 @@ /* Defined if a PETSc installation was found and is going to be used */ #cmakedefine DEAL_II_USE_PETSC -/* Define the PETSC version number: */ -#cmakedefine PETSC_VERSION_MAJOR @PETSC_VERSION_MAJOR@ -#cmakedefine PETSC_VERSION_MINOR @PETSC_VERSION_MINOR@ -#cmakedefine PETSC_VERSION_SUBMINOR @PETSC_VERSION_SUBMINOR@ -#cmakedefine PETSC_VERSION_SUBMINOR @PETSC_VERSION_SUBMINOR@ +/* Note: PETSCs version numbers will be directly included from + * petscversion.h + */ /* Defined if a PETSc installation was found with complex scalar type and is * going to be used -- 2.39.5