/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 3675 by jfenwick, Thu Nov 17 00:53:38 2011 UTC revision 3792 by caltinay, Wed Feb 1 06:16:25 2012 UTC
# Line 421  if not conf.CheckFunc('Py_Exit'): Line 421  if not conf.CheckFunc('Py_Exit'):
421      print("Cannot find python library method Py_Main (tried %s in directory %s)" % (python_libs, python_lib_path))      print("Cannot find python library method Py_Main (tried %s in directory %s)" % (python_libs, python_lib_path))
422      Exit(1)      Exit(1)
423    
424    # reuse conf to check for numpy header (optional)
425    if conf.CheckCXXHeader(['Python.h','numpy/ndarrayobject.h']):
426        conf.env.Append(CPPDEFINES = ['HAVE_NUMPY_H'])
427        conf.env['numpy_h']=True
428    else:
429        conf.env['numpy_h']=False
430    
431  # Commit changes to environment  # Commit changes to environment
432  env = conf.Finish()  env = conf.Finish()
433    
# Line 669  else: Line 676  else:
676      print("          LAPACK:  DISABLED")      print("          LAPACK:  DISABLED")
677  d_list=[]  d_list=[]
678  e_list=[]  e_list=[]
679  for i in 'debug','openmp','netcdf','parmetis','papi','mkl','umfpack','boomeramg','silo','visit':  for i in 'debug','openmp','netcdf','parmetis','papi','mkl','umfpack','boomeramg','silo','visit','vsl_random':
680      if env[i]: e_list.append(i)      if env[i]: e_list.append(i)
681      else: d_list.append(i)      else: d_list.append(i)
682  for i in e_list:  for i in e_list:
# Line 686  elif env['gmsh']=='s': Line 693  elif env['gmsh']=='s':
693      print("            gmsh:  FOUND")      print("            gmsh:  FOUND")
694  else:  else:
695      print("            gmsh:  NOT FOUND")      print("            gmsh:  NOT FOUND")
696  print("      vsl_random:  %s"%env['vsl_random'])  if env['numpy_h']:
697        print("   numpy headers:  FOUND")
698    else:
699        print("   numpy headers:  NOT FOUND")
700            
701  if ((fatalwarning != '') and (env['werror'])):  if ((fatalwarning != '') and (env['werror'])):
702      print("  Treating warnings as errors")      print("  Treating warnings as errors")
# Line 724  env.SConscript(dirs = ['esysUtils/src'], Line 734  env.SConscript(dirs = ['esysUtils/src'],
734  env.SConscript(dirs = ['pasowrap/src'], variant_dir='$BUILD_DIR/$PLATFORM/pasowrap', duplicate=0)  env.SConscript(dirs = ['pasowrap/src'], variant_dir='$BUILD_DIR/$PLATFORM/pasowrap', duplicate=0)
735  env.SConscript(dirs = ['dudley/src'], variant_dir='$BUILD_DIR/$PLATFORM/dudley', duplicate=0)  env.SConscript(dirs = ['dudley/src'], variant_dir='$BUILD_DIR/$PLATFORM/dudley', duplicate=0)
736  env.SConscript(dirs = ['finley/src'], variant_dir='$BUILD_DIR/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], variant_dir='$BUILD_DIR/$PLATFORM/finley', duplicate=0)
737    env.SConscript(dirs = ['ripley/src'], variant_dir='$BUILD_DIR/$PLATFORM/ripley', duplicate=0)
738  env.SConscript(dirs = ['modellib/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/modellib', duplicate=0)  env.SConscript(dirs = ['modellib/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/modellib', duplicate=0)
739  env.SConscript(dirs = ['doc'], variant_dir='$BUILD_DIR/$PLATFORM/doc', duplicate=0)  env.SConscript(dirs = ['doc'], variant_dir='$BUILD_DIR/$PLATFORM/doc', duplicate=0)
740  env.SConscript(dirs = ['pyvisi/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/pyvisi', duplicate=0)  env.SConscript(dirs = ['pyvisi/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/pyvisi', duplicate=0)
# Line 803  env.Alias('install_dudley', ['build_dudl Line 814  env.Alias('install_dudley', ['build_dudl
814  env.Alias('build_finley', ['install_finley_headers', 'build_finley_lib', 'build_finleycpp_lib'])  env.Alias('build_finley', ['install_finley_headers', 'build_finley_lib', 'build_finleycpp_lib'])
815  env.Alias('install_finley', ['build_finley', 'install_finley_lib', 'install_finleycpp_lib', 'install_finley_py'])  env.Alias('install_finley', ['build_finley', 'install_finley_lib', 'install_finleycpp_lib', 'install_finley_py'])
816    
817    env.Alias('build_ripley', ['install_ripley_headers', 'build_ripley_lib', 'build_ripleycpp_lib'])
818    env.Alias('install_ripley', ['build_ripley', 'install_ripley_lib', 'install_ripleycpp_lib', 'install_ripley_py'])
819    
820  env.Alias('build_weipa', ['install_weipa_headers', 'build_weipa_lib', 'build_weipacpp_lib'])  env.Alias('build_weipa', ['install_weipa_headers', 'build_weipa_lib', 'build_weipacpp_lib'])
821  env.Alias('install_weipa', ['build_weipa', 'install_weipa_lib', 'install_weipacpp_lib', 'install_weipa_py'])  env.Alias('install_weipa', ['build_weipa', 'install_weipa_lib', 'install_weipacpp_lib', 'install_weipa_py'])
822    
# Line 817  build_all_list += ['build_escript'] Line 831  build_all_list += ['build_escript']
831  build_all_list += ['build_pasowrap']  build_all_list += ['build_pasowrap']
832  build_all_list += ['build_dudley']  build_all_list += ['build_dudley']
833  build_all_list += ['build_finley']  build_all_list += ['build_finley']
834    build_all_list += ['build_ripley']
835  build_all_list += ['build_weipa']  build_all_list += ['build_weipa']
836  if not IS_WINDOWS: build_all_list += ['build_escriptreader']  if not IS_WINDOWS: build_all_list += ['build_escriptreader']
837  if env['usempi']:   build_all_list += ['build_pythonMPI']  if env['usempi']:   build_all_list += ['build_pythonMPI']
# Line 831  install_all_list += ['install_escript'] Line 846  install_all_list += ['install_escript']
846  install_all_list += ['install_pasowrap']  install_all_list += ['install_pasowrap']
847  install_all_list += ['install_dudley']  install_all_list += ['install_dudley']
848  install_all_list += ['install_finley']  install_all_list += ['install_finley']
849    install_all_list += ['install_ripley']
850  install_all_list += ['install_weipa']  install_all_list += ['install_weipa']
851  if not IS_WINDOWS: install_all_list += ['install_escriptreader']  if not IS_WINDOWS: install_all_list += ['install_escriptreader']
852  install_all_list += ['install_pyvisi_py']  install_all_list += ['install_pyvisi_py']

Legend:
Removed from v.3675  
changed lines
  Added in v.3792

  ViewVC Help
Powered by ViewVC 1.1.26