/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 3037 by caltinay, Mon Jun 14 00:59:30 2010 UTC revision 3039 by caltinay, Tue Jun 15 07:21:56 2010 UTC
# Line 706  if env_mpi['usempi'] and not conf.CheckC Line 706  if env_mpi['usempi'] and not conf.CheckC
706  if env_mpi['usempi']:  if env_mpi['usempi']:
707    env_mpi = conf.Finish()    env_mpi = conf.Finish()
708    env_mpi.Append(CPPDEFINES = ['PASO_MPI', 'MPI_NO_CPPBIND', env_mpi['MPICH_IGNORE_CXX_SEEK']])    env_mpi.Append(CPPDEFINES = ['PASO_MPI', 'MPI_NO_CPPBIND', env_mpi['MPICH_IGNORE_CXX_SEEK']])
709    if env['usenetcdf']:    # NetCDF 4.1 defines MPI_Comm et al. if MPI_INCLUDED is not defined!
710      env_mpi.Append(CPPDEFINES = ['MPI_INCLUDED']) # needed for NetCDF 4.1    # On the other hand MPT and OpenMPI don't define the latter so we have to
711      # do that here
712      if env['usenetcdf'] and env_mpi['mpi_flavour'] in ["MPT","OPENMPI"]:
713        env_mpi.Append(CPPDEFINES = ['MPI_INCLUDED'])
714  else:  else:
715    conf.Finish()    conf.Finish()
716    
Legend:
Removed from v.3037  
changed lines
  Added in v.3039
  ViewVC Help
Powered by ViewVC 1.1.26