/[escript]/branches/scons-dev/SConstruct
ViewVC logotype

Diff of /branches/scons-dev/SConstruct

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

revision 1652 by ksteube, Tue Jul 15 22:19:46 2008 UTC revision 1653 by ksteube, Wed Jul 16 00:31:11 2008 UTC
# Line 157  if env["CC"] == "icc": Line 157  if env["CC"] == "icc":
157    cp_flags      = "-ansi -wd161"    cp_flags      = "-ansi -wd161"
158    cc_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"    cc_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"
159    cp_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"    cp_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"
160    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF"    cc_debug      = "-g -O0 -UDOASSERT -DDOPROF"
161    cp_debug      = "-g -O0 -DDOASSERT -DDOPROF"    cp_debug      = "-g -O0 -UDOASSERT -DDOPROF"
162    omp_flags     = "-openmp -openmp_report0"    omp_flags     = "-openmp -openmp_report0"
163    omp_flags_debug   = "-openmp -openmp_report0"    omp_flags_debug   = "-openmp -openmp_report0"
164  elif env["CC"] == "gcc":  elif env["CC"] == "gcc":
165    # GNU C on any system    # GNU C on any system
166    cc_flags      = "-ffast-math -Wno-unknown-pragmas -ansi -DBLOCKTIMER -DCORE_ID1 -pedantic-errors -Wno-long-long"    cc_flags      = "-ansi -ffast-math -Wno-unknown-pragmas -pedantic-errors -Wno-long-long -DBLOCKTIMER"
167    cp_flags      = "--no-warn -ansi"    cp_flags      = "-ansi --no-warn"
168    cc_optim      = "-O3"    cc_optim      = "-O3"
169    cp_optim      = "-O3"    cp_optim      = "-O3"
170    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF"    cc_debug      = "-g -O0 -UDOASSERT -DDOPROF"
171    cp_debug      = "-g -O0 -DDOASSERT -DDOPROF"    cp_debug      = "-g -O0 -UDOASSERT -DDOPROF"
172    omp_flags     = ""    omp_flags     = ""
173    omp_flags_debug   = ""    omp_flags_debug   = ""
174  elif env["CC"] == "cl":  elif env["CC"] == "cl":
# Line 300  if env['usevtk']: Line 300  if env['usevtk']:
300    
301  ############ MPI (optional) ####################################  ############ MPI (optional) ####################################
302    
303  if env['useMPI']:  if env['usempi']:
304    conf.env.Append(CPPPATH   = [env['mpi_path']])    conf.env.Append(CPPPATH   = [env['mpi_path']])
305    conf.env.Append(LIBS      = [env['mpi_libs']])    conf.env.Append(LIBS      = [env['mpi_libs']])
306    conf.env.Append(LIBPATH   = [env['mpi_lib_path']])    conf.env.Append(LIBPATH   = [env['mpi_lib_path']])
307    if not conf.CheckCHeader('mpi.h'): env['useMPI'] = 0    if not conf.CheckCHeader('mpi.h'): env['usempi'] = 0
308    if not conf.CheckFunc('MPI_Init'): env['useMPI'] = 0    if not conf.CheckFunc('MPI_Init'): env['usempi'] = 0
309    
310  ############ ParMETIS (optional) ###############################  ############ ParMETIS (optional) ###############################
311    
312  if not env['useMPI']: env['useparmetis'] = 0  if not env['usempi']: env['useparmetis'] = 0
313    
314  if env['useparmetis']:  if env['useparmetis']:
315    conf.env.Append(CPPPATH   = [env['parmetis_path']])    conf.env.Append(CPPPATH   = [env['parmetis_path']])
# Line 368  except AttributeError: Line 368  except AttributeError:
368    env_mpi = env.Copy()  # scons-96.92    env_mpi = env.Copy()  # scons-96.92
369    
370  # MPI  # MPI
371  if env_mpi['useMPI']:  if env_mpi['usempi']:
372    env_mpi.Append(CPPPATH    = [env['mpi_path']])    env_mpi.Append(CPPPATH    = [env['mpi_path']])
373    env_mpi.Append(LIBPATH    = [env['mpi_lib_path']])    env_mpi.Append(LIBPATH    = [env['mpi_lib_path']])
374    env_mpi.Append(LIBS       = [env['mpi_libs']])    env_mpi.Append(LIBS       = [env['mpi_libs']])
# Line 403  env.Append(BUILDERS = {'RunPyUnitTest' : Line 403  env.Append(BUILDERS = {'RunPyUnitTest' :
403  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
404    env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")    env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")
405    if env['usedebug']:       env.Execute("touch " + libinstall + "/Compiled.with.debug")    if env['usedebug']:       env.Execute("touch " + libinstall + "/Compiled.with.debug")
406    if env['useMPI']:     env.Execute("touch " + libinstall + "/Compiled.with.mpi")    if env['usempi']:     env.Execute("touch " + libinstall + "/Compiled.with.mpi")
407    if env['omp_flags'] != '':    env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")    if env['omp_flags'] != '':    env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")
408    
409  Export(["env", "env_mpi", "incinstall", "libinstall", "pyinstall", "sys_libs", "prefix" ])  Export(["env", "env_mpi", "incinstall", "libinstall", "pyinstall", "sys_libs", "prefix" ])

Legend:
Removed from v.1652  
changed lines
  Added in v.1653

  ViewVC Help
Powered by ViewVC 1.1.26