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

Diff of /branches/trilinos_from_5897/SConstruct

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

revision 5932 by caltinay, Mon Feb 8 01:21:32 2016 UTC revision 5933 by caltinay, Wed Feb 17 23:53:30 2016 UTC
# Line 138  vars.AddVariables( Line 138  vars.AddVariables(
138    ('env_export', 'Environment variables to be passed to tools',[]),    ('env_export', 'Environment variables to be passed to tools',[]),
139    EnumVariable('forcelazy', 'For testing use only - set the default value for autolazy', 'leave_alone', allowed_values=('leave_alone', 'on', 'off')),    EnumVariable('forcelazy', 'For testing use only - set the default value for autolazy', 'leave_alone', allowed_values=('leave_alone', 'on', 'off')),
140    EnumVariable('forcecollres', 'For testing use only - set the default value for force resolving collective ops', 'leave_alone', allowed_values=('leave_alone', 'on', 'off')),    EnumVariable('forcecollres', 'For testing use only - set the default value for force resolving collective ops', 'leave_alone', allowed_values=('leave_alone', 'on', 'off')),
141    ('build_shared', 'Build dynamic libraries only', False),    ('build_shared', 'Build dynamic libraries only', True),
142    ('sys_libs', 'Extra libraries to link with', []),    ('sys_libs', 'Extra libraries to link with', []),
143    ('escript_opts_version', 'Version of options file (do not specify on command line)'),    ('escript_opts_version', 'Version of options file (do not specify on command line)'),
144    ('SVN_VERSION', 'Do not use from options file', -2),    ('SVN_VERSION', 'Do not use from options file', -2),
# Line 587  env.SConscript(dirs = ['cusplibrary']) Line 587  env.SConscript(dirs = ['cusplibrary'])
587  #This will pull in the escriptcore/py_src and escriptcore/test  #This will pull in the escriptcore/py_src and escriptcore/test
588  env.SConscript(dirs = ['escriptcore/src'], variant_dir='$BUILD_DIR/$PLATFORM/escriptcore', duplicate=0)  env.SConscript(dirs = ['escriptcore/src'], variant_dir='$BUILD_DIR/$PLATFORM/escriptcore', duplicate=0)
589  env.SConscript(dirs = ['esysUtils/src'], variant_dir='$BUILD_DIR/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], variant_dir='$BUILD_DIR/$PLATFORM/esysUtils', duplicate=0)
 env.SConscript(dirs = ['pasowrap/src'], variant_dir='$BUILD_DIR/$PLATFORM/pasowrap', duplicate=0)  
590  if env['trilinos']:  if env['trilinos']:
591      env.SConscript(dirs = ['trilinoswrap/src'], variant_dir='$BUILD_DIR/$PLATFORM/trilinoswrap', duplicate=0)      env.SConscript(dirs = ['trilinoswrap/src'], variant_dir='$BUILD_DIR/$PLATFORM/trilinoswrap', duplicate=0)
592  if 'dudley' in env['domains']:  if 'dudley' in env['domains']:
# Line 630  env.Alias('install_paso', ['build_paso', Line 629  env.Alias('install_paso', ['build_paso',
629  env.Alias('build_escript', ['install_escript_headers', 'build_escript_lib', 'build_escriptcpp_lib'])  env.Alias('build_escript', ['install_escript_headers', 'build_escript_lib', 'build_escriptcpp_lib'])
630  env.Alias('install_escript', ['build_escript', 'install_escript_lib', 'install_escriptcpp_lib', 'install_escriptcore_py', 'install_escript_py'])  env.Alias('install_escript', ['build_escript', 'install_escript_lib', 'install_escriptcpp_lib', 'install_escriptcore_py', 'install_escript_py'])
631    
 env.Alias('build_pasowrap', ['install_pasowrap_headers', 'build_pasowrap_lib', 'build_pasowrapcpp_lib'])  
 env.Alias('install_pasowrap', ['build_pasowrap', 'install_pasowrap_lib', 'install_pasowrapcpp_lib', 'install_pasowrap_py'])  
   
632  if env['trilinos']:  if env['trilinos']:
633      env.Alias('build_trilinoswrap', ['install_trilinoswrap_headers', 'build_trilinoswrap_lib'])      env.Alias('build_trilinoswrap', ['install_trilinoswrap_headers', 'build_trilinoswrap_lib'])
634      env.Alias('install_trilinoswrap', ['build_trilinoswrap', 'install_trilinoswrap_lib'])      env.Alias('install_trilinoswrap', ['build_trilinoswrap', 'install_trilinoswrap_lib'])
# Line 664  build_all_list = [] Line 660  build_all_list = []
660  build_all_list += ['build_esysUtils']  build_all_list += ['build_esysUtils']
661  build_all_list += ['build_paso']  build_all_list += ['build_paso']
662  build_all_list += ['build_escript']  build_all_list += ['build_escript']
 build_all_list += ['build_pasowrap']  
663  if env['trilinos']: build_all_list += ['build_trilinoswrap']  if env['trilinos']: build_all_list += ['build_trilinoswrap']
664  if 'dudley' in env['domains']: build_all_list += ['build_dudley']  if 'dudley' in env['domains']: build_all_list += ['build_dudley']
665  if 'finley' in env['domains']: build_all_list += ['build_finley']  if 'finley' in env['domains']: build_all_list += ['build_finley']
# Line 682  install_all_list += ['target_init'] Line 677  install_all_list += ['target_init']
677  install_all_list += ['install_esysUtils']  install_all_list += ['install_esysUtils']
678  install_all_list += ['install_paso']  install_all_list += ['install_paso']
679  install_all_list += ['install_escript']  install_all_list += ['install_escript']
 install_all_list += ['install_pasowrap']  
680  if env['trilinos']: install_all_list += ['install_trilinoswrap']  if env['trilinos']: install_all_list += ['install_trilinoswrap']
681  if 'dudley' in env['domains']: install_all_list += ['install_dudley']  if 'dudley' in env['domains']: install_all_list += ['install_dudley']
682  if 'finley' in env['domains']: install_all_list += ['install_finley']  if 'finley' in env['domains']: install_all_list += ['install_finley']

Legend:
Removed from v.5932  
changed lines
  Added in v.5933

  ViewVC Help
Powered by ViewVC 1.1.26