[cig-commits] commit: Need to be careful about when we check for the

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


changeset:   31:44c78010b256
user:        LukeHodkinson
date:        Thu Feb 14 23:40:57 2008 +0000
files:       SConfigure
description:
Need to be careful about when we check for the
connection between PETScExt and PETSc.


diff -r 0957ae6cda39 -r 44c78010b256 SConfigure
--- a/SConfigure	Thu Feb 14 23:34:01 2008 +0000
+++ b/SConfigure	Thu Feb 14 23:40:57 2008 +0000
@@ -195,9 +195,6 @@ petsc.add_options(opts)
 
 petscext = env.Package('PETScExt', env)
 petscext.pkg_dirs = ['petscext*', 'PETScExt*', 'PETSCEXT*']
-state = env['PACKAGES'].get('PETSc', None)
-if state:
-    petscext.lib_sub_dirs = ['', state.arch]
 petscext.hdrs = ['petscext.h']
 petscext.libs = [('petscext_vec', 'petscext_mat',
                   'petscext_ksp', 'petscext_pc',
@@ -332,6 +329,9 @@ if not 'help' in COMMAND_LINE_TARGETS:
     env.Append(CPPDEFINES=['HAVE_PETSC'])
 
     # Check for an implementation of PETScExt.
+    state = env['PACKAGES'].get('PETSc', None)
+    if state:
+        petscext.lib_sub_dirs = ['', state.arch]
     if not cfg.CheckPackage(petscext):
         petscext.print_opts_help()
         env.Exit()



More information about the CIG-COMMITS mailing list