]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes to be able to run the testsuite
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 18:12:26 +0000 (18:12 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 18:12:26 +0000 (18:12 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27011 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/config/Make.global_options.in
tests/tests.h

index e95307d75761209fd77b7f11cc09b51015389024..cd03ed040bf9bf2e5c0068925a038cc7b2bc23e2 100644 (file)
@@ -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:
index e7bec330358e6cd013c136febc0bc8db4c0573d8..e3828d1a4bc3415df448628db1bbfa293fe30ab4 100644 (file)
@@ -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
 {

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.