/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2337 by jfenwick, Thu Mar 26 03:05:33 2009 UTC revision 2338 by jfenwick, Fri Mar 27 05:01:49 2009 UTC
# Line 98  opts.AddOptions( Line 98  opts.AddOptions(
98    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),
99    ('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)', usr_lib),    ('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)', usr_lib),
100    ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', ['mpich' , 'pthread', 'rt']),    ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', ['mpich' , 'pthread', 'rt']),
101      ('mpi_flavour','Type of MPI execution environment','none'),
102  # ParMETIS  # ParMETIS
103    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),
104    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),
# Line 408  if env['usevtk']: Line 409  if env['usevtk']:
409    
410  conf = Configure(clone_env(env))  conf = Configure(clone_env(env))
411    
 print "<1<<<<"+str(conf.env['ENV']['LD_LIBRARY_PATH'])  
   
   
412  if env['usenetcdf']:  if env['usenetcdf']:
413    conf.env.AppendUnique(CPPPATH = [env['netCDF_path']])    conf.env.AppendUnique(CPPPATH = [env['netCDF_path']])
414    conf.env.AppendUnique(LIBPATH = [env['netCDF_lib_path']])    conf.env.AppendUnique(LIBPATH = [env['netCDF_lib_path']])
# Line 423  if env['usenetcdf']: Line 421  if env['usenetcdf']:
421  if env['usenetcdf'] and not conf.CheckCHeader('netcdf.h'): env['usenetcdf'] = 0  if env['usenetcdf'] and not conf.CheckCHeader('netcdf.h'): env['usenetcdf'] = 0
422  if env['usenetcdf'] and not conf.CheckFunc('nc_open'): env['usenetcdf'] = 0  if env['usenetcdf'] and not conf.CheckFunc('nc_open'): env['usenetcdf'] = 0
423    
 print "<2<<<<"+str(conf.env['ENV']['LD_LIBRARY_PATH'])  
   
424  # Add NetCDF to environment env if it was found  # Add NetCDF to environment env if it was found
425  if env['usenetcdf']:  if env['usenetcdf']:
426    env = conf.Finish()    env = conf.Finish()
# Line 432  if env['usenetcdf']: Line 428  if env['usenetcdf']:
428  else:  else:
429    conf.Finish()    conf.Finish()
430    
 print "<A<<<<"+str(env['ENV']['LD_LIBRARY_PATH'])  
   
431  ############ PAPI (optional) ###################################  ############ PAPI (optional) ###################################
432    
433  # Start a new configure environment that reflects what we've already found  # Start a new configure environment that reflects what we've already found
# Line 753  if env['useopenmp']: Line 747  if env['useopenmp']:
747  else:  else:
748      out+="n"      out+="n"
749  buildvars.write(out+"\n")  buildvars.write(out+"\n")
750    buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')
751    
752  buildvars.close()  buildvars.close()
753    
Legend:
Removed from v.2337  
changed lines
  Added in v.2338
  ViewVC Help
Powered by ViewVC 1.1.26