Handle PETSC_USE_DYNAMIC_LIBRARIES in the same way as PETSc

jedbrown · Apr 11, 2011 · d4a2fe4 · d4a2fe4
1 parent 0e42d4a
commit d4a2fe4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/include/dohpfs.h b/include/dohpfs.h
@@ -122,7 +122,13 @@ extern dErr dRulesetIteratorGetStash(dRulesetIterator,void *patchstash,void *nod
 extern dErr dFSDestroy(dFS);
 extern dErr dFSView(dFS,dViewer);
 extern dErr dFSLoadIntoFS(dViewer,const char[],dFS);
-#define dFSRegisterDynamic(a,b,c,d) dFSRegister(a,b,c,d)
+
+#if defined PETSC_USE_DYNAMIC_LIBRARIES
+#  define dFSRegisterDynamic(a,b,c,d) dFSRegister(a,b,c,0)
+#else
+#  define dFSRegisterDynamic(a,b,c,d) dFSRegister(a,b,c,d)
+#endif
+
 extern dErr dFSRegister(const char[],const char[],const char[],dErr(*)(dFS));
 extern dErr dFSRegisterAll(const char[]);
 extern dErr dFSInitializePackage(const char[]);

diff --git a/include/dohpjacobi.h b/include/dohpjacobi.h
@@ -151,7 +151,12 @@ extern dErr dJacobiGetType(dJacobi,const dJacobiType*);
 extern dErr dJacobiSetFromOptions(dJacobi);
 extern dErr dJacobiDestroy(dJacobi);
 extern dErr dJacobiView(dJacobi,dViewer);
-#define dJacobiRegisterDynamic(a,b,c,d) dJacobiRegister(a,b,c,d)
+
+#if defined PETSC_USE_DYNAMIC_LIBRARIES
+#  define dJacobiRegisterDynamic(a,b,c,d) dJacobiRegister(a,b,c,0)
+#else
+#  define dJacobiRegisterDynamic(a,b,c,d) dJacobiRegister(a,b,c,d)
+#endif
 extern dErr dJacobiRegister(const char[],const char[],const char[],dErr(*)(dJacobi));
 extern dErr dJacobiRegisterAll(const char[]);
 extern dErr dJacobiInitializePackage(const char[]);
@@ -183,7 +188,11 @@ extern dErr dRuleGetTensorNodeWeight(dRule rule,dInt *dim,dInt *nnodes,const dRe
 extern dErr dRuleComputeGeometry(dRule rule,const dReal vtx[restrict][3],dReal[restrict][3],dReal jinv[restrict][3][3],dReal jdet[restrict]);
 extern dErr dRuleComputePhysical(dRule rule,const dScalar jac[],dScalar jinv[],dScalar jw[]);
 
-#define dQuadratureRegisterDynamic(a,b,c,d) dQuadratureRegister(a,b,c,d)
+#if defined PETSC_USE_DYNAMIC_LIBRARIES
+#  define dQuadratureRegisterDynamic(a,b,c,d) dQuadratureRegister(a,b,c,0)
+#else
+#  define dQuadratureRegisterDynamic(a,b,c,d) dQuadratureRegister(a,b,c,d)
+#endif
 extern dErr dQuadratureRegister(const char[],const char[],const char[],dErr(*)(dQuadrature));
 extern dErr dQuadratureRegisterAll(const char[]);
 

diff --git a/include/dohpmesh.h b/include/dohpmesh.h
@@ -116,7 +116,11 @@ extern dErr dMeshDestroy(dMesh);
 extern dErr dMeshView(dMesh,dViewer);
 extern dErr dMeshSetView(dMesh m,dMeshESH root,PetscViewer viewer);
 extern dErr dMeshRegisterAll(const char path[]);
-#define dMeshRegisterDynamic(a,b,c,d) dMeshRegister(a,b,c,d)
+#if defined PETSC_USE_DYNAMIC_LIBRARIES
+#  define dMeshRegisterDynamic(a,b,c,d) dMeshRegister(a,b,c,0)
+#else
+#  define dMeshRegisterDynamic(a,b,c,d) dMeshRegister(a,b,c,d)
+#endif
 extern dErr dMeshRegister(const char[],const char[],const char[],dErr(*)(dMesh));
 extern dErr dMeshSetType(dMesh,const dMeshType);
 extern dErr dMeshInitializePackage(const char[]);