/[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 6008 by caltinay, Mon Feb 22 06:59:27 2016 UTC revision 6009 by caltinay, Wed Mar 2 04:13:26 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', True),    ('build_shared', 'Build dynamic libraries only (ignored)', 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 410  env['svn_revision']=global_revision Line 410  env['svn_revision']=global_revision
410  env['buildvars']['svn_revision']=global_revision  env['buildvars']['svn_revision']=global_revision
411  env.Append(CPPDEFINES=['SVN_VERSION='+global_revision])  env.Append(CPPDEFINES=['SVN_VERSION='+global_revision])
412    
 if IS_WINDOWS:  
     if not env['build_shared']:  
         env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])  
         env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])  
   
413  env['IS_WINDOWS']=IS_WINDOWS  env['IS_WINDOWS']=IS_WINDOWS
414  env['IS_OSX']=IS_OSX  env['IS_OSX']=IS_OSX
415    
# Line 586  env.SConscript(dirs = ['cusplibrary']) Line 581  env.SConscript(dirs = ['cusplibrary'])
581    
582  #This will pull in the escriptcore/py_src and escriptcore/test  #This will pull in the escriptcore/py_src and escriptcore/test
583  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)
 env.SConscript(dirs = ['esysUtils/src'], variant_dir='$BUILD_DIR/$PLATFORM/esysUtils', duplicate=0)  
584  if env['trilinos']:  if env['trilinos']:
585      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)
586  if 'dudley' in env['domains']:  if 'dudley' in env['domains']:
# Line 618  env.Alias('target_init', [target_init]) Line 612  env.Alias('target_init', [target_init])
612  # delete buildvars upon cleanup  # delete buildvars upon cleanup
613  env.Clean('target_init', os.path.join(env['libinstall'], 'buildvars'))  env.Clean('target_init', os.path.join(env['libinstall'], 'buildvars'))
614    
615  # The headers have to be installed prior to build in order to satisfy  # The headers have to be installed prior to build
 # #include <paso/Common.h>  
 env.Alias('build_esysUtils', ['install_esysUtils_headers', 'build_esysUtils_lib'])  
 env.Alias('install_esysUtils', ['build_esysUtils', 'install_esysUtils_lib'])  
616    
617  env.Alias('build_paso', ['install_paso_headers', 'build_paso_lib'])  env.Alias('build_paso', ['install_paso_headers', 'build_paso_lib'])
618  env.Alias('install_paso', ['build_paso', 'install_paso_lib'])  env.Alias('install_paso', ['build_paso', 'install_paso_lib'])
# Line 657  env.Alias('install_escriptreader', ['bui Line 648  env.Alias('install_escriptreader', ['bui
648    
649  # Now gather all the above into some easy targets: build_all and install_all  # Now gather all the above into some easy targets: build_all and install_all
650  build_all_list = []  build_all_list = []
 build_all_list += ['build_esysUtils']  
651  build_all_list += ['build_paso']  build_all_list += ['build_paso']
652  build_all_list += ['build_escript']  build_all_list += ['build_escript']
653  if env['trilinos']: build_all_list += ['build_trilinoswrap']  if env['trilinos']: build_all_list += ['build_trilinoswrap']
# Line 674  env.Alias('build_all', build_all_list) Line 664  env.Alias('build_all', build_all_list)
664    
665  install_all_list = []  install_all_list = []
666  install_all_list += ['target_init']  install_all_list += ['target_init']
 install_all_list += ['install_esysUtils']  
667  install_all_list += ['install_paso']  install_all_list += ['install_paso']
668  install_all_list += ['install_escript']  install_all_list += ['install_escript']
669  if env['trilinos']: install_all_list += ['install_trilinoswrap']  if env['trilinos']: install_all_list += ['install_trilinoswrap']

Legend:
Removed from v.6008  
changed lines
  Added in v.6009

  ViewVC Help
Powered by ViewVC 1.1.26