/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1339 by ksteube, Wed Nov 7 01:53:12 2007 UTC revision 1360 by ksteube, Thu Dec 13 05:05:00 2007 UTC
# Line 301  Help(opts.GenerateHelpText(env)) Line 301  Help(opts.GenerateHelpText(env))
301  if env['bounds_check']:  if env['bounds_check']:
302     env.Append(CPPDEFINES = [ 'BOUNDS_CHECK' ])     env.Append(CPPDEFINES = [ 'BOUNDS_CHECK' ])
303     env.Append(CXXDEFINES = [ 'BOUNDS_CHECK' ])     env.Append(CXXDEFINES = [ 'BOUNDS_CHECK' ])
304       bounds_check = env['bounds_check']
305    else:
306       bounds_check = 0
307    
308  #=================================================================================================  #=================================================================================================
309  #  #
# Line 446  except KeyError: Line 449  except KeyError:
449     useMPI = None     useMPI = None
450  # ========= set compiler flags ===========================================  # ========= set compiler flags ===========================================
451    
452    # Can't use MPI and OpenMP simultaneously at this time
453    if useMPI:
454        omp_flags=''
455        omp_flags_debug=''
456    
457  if dodebug:  if dodebug:
458      try:      try:
459        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
# Line 475  try: Line 483  try:
483  except:  except:
484       pass       pass
485    
486    # ============= Remember what options were used in the compile =====================================
487    if not IS_WINDOWS_PLATFORM:
488      env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")
489      if dodebug:       env.Execute("touch " + libinstall + "/Compiled.with.debug")
490      if useMPI:        env.Execute("touch " + libinstall + "/Compiled.with.mpi")
491      if omp_flags != '':   env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")
492      if bounds_check:  env.Execute("touch " + libinstall + "/Compiled.with.bounds_check")
493    
494  # ============= set mkl (but only of no MPI) =====================================  # ============= set mkl (but only of no MPI) =====================================
495  if not useMPI:  if not useMPI:
496     try:     try:
# Line 624  try: Line 640  try:
640  except KeyError:  except KeyError:
641     blas_libs = [ ]     blas_libs = [ ]
642    
643  # ========== netcdf (currently not supported with mpi) ====================================  # ========== netcdf ====================================
644  if useMPI:  try:
645     useNetCDF = 'no'     useNetCDF = env['useNetCDF']
646  else:  except KeyError:
647     try:     useNetCDF = 'yes'
648        useNetCDF = env['useNetCDF']     pass
    except KeyError:  
       useNetCDF = 'yes'  
       pass  
649            
650  if useNetCDF == 'yes':  if useNetCDF == 'yes':
651     try:     try:

Legend:
Removed from v.1339  
changed lines
  Added in v.1360

  ViewVC Help
Powered by ViewVC 1.1.26