From aa5e6558158480ab3983beb4daa1fdadeac95410 Mon Sep 17 00:00:00 2001 From: eschnett Date: Thu, 23 Dec 2010 20:23:30 +0000 Subject: Improve optional requirement of capabilities Thorns can specify that they can make use of a particular capability (for example HDF5), but that it is not absolutely required. It is currently not possible to detect a capability in the source code or make system of a thorn because there is no preprocessor macro and no make variable defined to indicate that the capability is available. Additionally, the preprocessor definitions which are explicitly provided by a capability are written to an include file which is malformed and hence these definitions cannot be read. This commit: * Introduces makefile and preprocessor variables HAVE_CAPABILITY_ for each provided capability * Removes the incorrect definition line causing the include file to be malformed * Renames cctki_Capabilities.h to cctk_Capabilities.h and causes cctk_Capabilities.h to be included from cctk.h by all thorns * Excludes cctk_Capabilities.h from dependency checking (dependencies of the files included from this one will be sufficient) [Patch from Ian Hinder] git-svn-id: http://svn.cactuscode.org/flesh/trunk@4659 17b73243-c579-4c4c-a9d2-2d5706c11dac --- src/include/cctk.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/include/cctk.h') diff --git a/src/include/cctk.h b/src/include/cctk.h index 75da0d53..ed3d461d 100644 --- a/src/include/cctk.h +++ b/src/include/cctk.h @@ -158,6 +158,8 @@ cctk_convfac,cctk_nghostzones,cctk_iteration,cctkGH #include "cctk_Timers.h" #include "cctk_WarnLevel.h" +/* Include definitions provided by capabilities */ +#include "cctk_Capabilities.h" /* * routines/macros to compute the linear index -- cgit v1.2.3