/[escript]/branches/amg_from_3530/SConstruct
ViewVC logotype

Diff of /branches/amg_from_3530/SConstruct

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

revision 2884 by jfenwick, Thu Jan 28 05:00:59 2010 UTC revision 2924 by trankine, Thu Feb 4 05:30:53 2010 UTC
# Line 479  conf.env.PrependENVPath(LD_LIBRARY_PATH_ Line 479  conf.env.PrependENVPath(LD_LIBRARY_PATH_
479  conf.env.PrependENVPath('PYTHONPATH', prefix)  conf.env.PrependENVPath('PYTHONPATH', prefix)
480  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])
481    
482  if not conf.CheckCXXHeader('boost/python.hpp'):  
483    print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])  #Yep we still cant figure this one out. - working on it.
484    sys.exit(1)  if not IS_WINDOWS_PLATFORM:
485      if not conf.CheckCXXHeader('boost/python.hpp'):
486  if not conf.CheckFunc('PyObject_SetAttr'):      print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])
487    print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])      sys.exit(1)
488    sys.exit(1)  
489      if not conf.CheckFunc('PyObject_SetAttr'):
490        print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])
491        sys.exit(1)
492    
493    
494  # Commit changes to environment  # Commit changes to environment
495  env = conf.Finish()  env = conf.Finish()
# Line 626  if env['usesilo']: Line 630  if env['usesilo']:
630  if env['usesilo']:  if env['usesilo']:
631    env.AppendUnique(CPPPATH = [env['silo_path']])    env.AppendUnique(CPPPATH = [env['silo_path']])
632    env.AppendUnique(LIBPATH = [env['silo_lib_path']])    env.AppendUnique(LIBPATH = [env['silo_lib_path']])
   env.Append(CPPDEFINES = ['USE_SILO'])  
633    
634  ########### Lapack (optional) ##################################  ########### Lapack (optional) ##################################
635    
# Line 911  env.Alias('install_paso', ['build_paso', Line 914  env.Alias('install_paso', ['build_paso',
914  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'])
915  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'])
916    
917    env.Alias('build_escriptreader', ['target_install_escriptexport_headers', 'target_escriptreader_a'])
918    env.Alias('install_escriptreader', ['build_escriptreader', 'target_install_escriptreader_a'])
919    
920  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'])
921  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'])
922    
# Line 961  env.Alias('build_full',['install_all','b Line 967  env.Alias('build_full',['install_all','b
967    
968  env.Alias('api_epydoc','install_all')  env.Alias('api_epydoc','install_all')
969    
970  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'])
971    
972  build_platform=os.name  build_platform=os.name
973    
# Line 989  if not IS_WINDOWS_PLATFORM: Line 995  if not IS_WINDOWS_PLATFORM:
995  ############ Targets to build PasoTests suite ################  ############ Targets to build PasoTests suite ################
996    
997  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')
998    
999    env.Alias('release_prep', ['docs', 'install_all'])

Legend:
Removed from v.2884  
changed lines
  Added in v.2924

  ViewVC Help
Powered by ViewVC 1.1.26