From 6dbddcf496d1d56033412d649ff5048d7df4c401 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 8 Oct 2012 18:12:26 +0000 Subject: [PATCH] Bugfixes to be able to run the testsuite git-svn-id: https://svn.dealii.org/branches/branch_cmake@27011 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/config/Make.global_options.in | 7 ++++--- tests/tests.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deal.II/config/Make.global_options.in b/deal.II/config/Make.global_options.in index e95307d757..cd03ed040b 100644 --- a/deal.II/config/Make.global_options.in +++ b/deal.II/config/Make.global_options.in @@ -42,8 +42,9 @@ DEAL_II_VERSION = @VERSION@ DEAL_II_MAJOR = @DEAL_II_VERSION_MAJOR@ DEAL_II_MINOR = @DEAL_II_VERSION_MINOR@ +PERL = perl + -# TODO: CONTRIB is not really the correct wording... USE_CONTRIB_PETSC = @MAKEFILE_PETSC@ USE_CONTRIB_SLEPC = @USE_CONTRIB_SLEPC@ USE_CONTRIB_TRILINOS = @MAKEFILE_TRILINOS@ @@ -57,8 +58,8 @@ USE_CONTRIB_UMFPACK = @MAKEFILE_UMFPACK@ USE_CONTRIB_P4EST = @MAKEFILE_P4EST@ DEAL_II_USE_MPI = @MAKEFILE_MPI@ -OBJEXT = o # TODO: @CMAKE_CXX_OUTPUT_EXTENSION@ :-* -EXEEXT = # TODO +OBJEXT = o +EXEEXT = # set paths to all the libraries we need: diff --git a/tests/tests.h b/tests/tests.h index e7bec33035..e3828d1a4b 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -125,7 +125,7 @@ set_grain_sizes; // // the actual sleep time isn't all that important. the point is that // we need to kill deadlocked threads at one point, whenever that is -#if DEAL_II_USE_MT == 1 +#ifdef DEAL_II_USE_MT struct DeadlockKiller { -- 2.39.5