[cig-commits] commit: Updating to equivalent of stgUnderworldE.

Mercurial hg at geodynamics.org
Mon Nov 24 11:22:40 PST 2008


changeset:   16:b4674cc0f68e
user:        LukeHodkinson
date:        Thu Feb 07 23:44:22 2008 +0000
files:       SConfigure
description:
Updating to equivalent of stgUnderworldE.


diff -r e3258565f076 -r b4674cc0f68e SConfigure
--- a/SConfigure	Thu Feb 07 23:31:34 2008 +0000
+++ b/SConfigure	Thu Feb 07 23:44:22 2008 +0000
@@ -151,6 +151,7 @@ if not env.GetOption('clean'):
 
     mpich = env.Package('MPICH', env)
     mpich.pkg_dirs = ['mpich*', 'MPICH*']
+    mpich.hdr_sub_dirs = ['', 'mpi']
     mpich.lib_sub_dirs = ['', 'shared']
     mpich.hdrs = ['mpi.h']
     mpich.libs = ['mpich',
@@ -351,6 +352,21 @@ if not env.GetOption('clean'):
         avc.add_options(opts)
 
     #
+    # Setup HDF5.
+    #
+
+    hdf = env.Package('HDF5', env)
+    hdf.hdrs = ['hdf5.h']
+    hdf.libs = ['hdf5']
+
+    if not build_opts:
+        if cfg.CheckPackage(hdf):
+            env.Append(CPPDEFINES='HAVE_HDF5')
+        opts.Save('config.cache', env)
+    else:
+        hdf.add_options(opts)
+
+    #
     # Check Fortran symbol type.
     #
 



More information about the CIG-COMMITS mailing list