/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2882 by caltinay, Thu Jan 28 02:27:49 2010 UTC revision 2923 by jfenwick, Thu Feb 4 04:05:36 2010 UTC
# Line 241  omp_libs = [] Line 241  omp_libs = []
241    
242  if env["CC"] == "icc":  if env["CC"] == "icc":
243    # Intel compilers    # Intel compilers
244    cc_flags      = "-fPIC -ansi -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"    cc_flags      = "-std=c99 -fPIC -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"
245    cc_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"    cc_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"
246    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
247    omp_optim     = "-openmp -openmp_report0"    omp_optim     = "-openmp -openmp_report0"
# Line 252  if env["CC"] == "icc": Line 252  if env["CC"] == "icc":
252    sysheaderopt      = ""    sysheaderopt      = ""
253  elif env["CC"][:3] == "gcc":  elif env["CC"][:3] == "gcc":
254    # GNU C on any system    # GNU C on any system
255    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER  -Wno-sign-compare -Wno-system-headers -Wno-long-long -Wno-strict-aliasing"    cc_flags      = "-pedantic -Wall -fPIC -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER  -Wno-sign-compare -Wno-system-headers -Wno-long-long -Wno-strict-aliasing"
256  #the long long warning occurs on the Mac  #the long long warning occurs on the Mac
257    cc_optim      = "-O3"    cc_optim      = "-O3"
258    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
# Line 626  if env['usesilo']: Line 626  if env['usesilo']:
626  if env['usesilo']:  if env['usesilo']:
627    env.AppendUnique(CPPPATH = [env['silo_path']])    env.AppendUnique(CPPPATH = [env['silo_path']])
628    env.AppendUnique(LIBPATH = [env['silo_lib_path']])    env.AppendUnique(LIBPATH = [env['silo_lib_path']])
   env.Append(CPPDEFINES = ['USE_SILO'])  
629    
630  ########### Lapack (optional) ##################################  ########### Lapack (optional) ##################################
631    
# Line 911  env.Alias('install_paso', ['build_paso', Line 910  env.Alias('install_paso', ['build_paso',
910  env.Alias('build_dataexporter', ['target_install_escriptexport_headers', 'target_escriptexport_so', 'target_escriptexportcpp_so'])  env.Alias('build_dataexporter', ['target_install_escriptexport_headers', 'target_escriptexport_so', 'target_escriptexportcpp_so'])
911  env.Alias('install_dataexporter', ['build_dataexporter', 'target_install_escriptexport_so', 'target_install_escriptexportcpp_so', 'target_install_dataexporter_py'])  env.Alias('install_dataexporter', ['build_dataexporter', 'target_install_escriptexport_so', 'target_install_escriptexportcpp_so', 'target_install_dataexporter_py'])
912    
913    env.Alias('build_escriptreader', ['target_install_escriptexport_headers', 'target_escriptreader_a'])
914    env.Alias('install_escriptreader', ['build_escriptreader', 'target_install_escriptreader_a'])
915    
916  env.Alias('build_escript', ['target_install_escript_headers', 'target_escript_so', 'target_escriptcpp_so'])  env.Alias('build_escript', ['target_install_escript_headers', 'target_escript_so', 'target_escriptcpp_so'])
917  env.Alias('install_escript', ['build_escript', 'target_install_escript_so', 'target_install_escriptcpp_so', 'target_install_escript_py'])  env.Alias('install_escript', ['build_escript', 'target_install_escript_so', 'target_install_escriptcpp_so', 'target_install_escript_py'])
918    
# Line 961  env.Alias('build_full',['install_all','b Line 963  env.Alias('build_full',['install_all','b
963    
964  env.Alias('api_epydoc','install_all')  env.Alias('api_epydoc','install_all')
965    
966  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf', 'cookbook_pdf'])
967    
968  build_platform=os.name  build_platform=os.name
969    
# Line 989  if not IS_WINDOWS_PLATFORM: Line 991  if not IS_WINDOWS_PLATFORM:
991  ############ Targets to build PasoTests suite ################  ############ Targets to build PasoTests suite ################
992    
993  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')
994    
995    env.Alias('release_prep', ['docs', 'install_all'])

Legend:
Removed from v.2882  
changed lines
  Added in v.2923

  ViewVC Help
Powered by ViewVC 1.1.26