/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 3036 by caltinay, Mon Jun 14 00:13:18 2010 UTC revision 3076 by jfenwick, Mon Aug 2 05:21:40 2010 UTC
# Line 171  adder( Line 171  adder(
171    ('lapack_libs', 'Lapack libraries to link with', []),    ('lapack_libs', 'Lapack libraries to link with', []),
172    ('lapack_type', '{clapack,mkl}','clapack'),    ('lapack_type', '{clapack,mkl}','clapack'),
173  # An option for specifying the compiler tools set (see windows branch).  # An option for specifying the compiler tools set (see windows branch).
174    ('tools_names', 'allow control over the tools in the env setup', ['intelc']),    ('tools_names', 'allow control over the tools in the env setup', ['default']),
175  # finer control over library building, intel aggressive global optimisation  # finer control over library building, intel aggressive global optimisation
176  # works with dynamic libraries on windows.  # works with dynamic libraries on windows.
177    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),
# Line 181  adder( Line 181  adder(
181    BoolVariable('iknowwhatimdoing','allow nonstandard C',False)    BoolVariable('iknowwhatimdoing','allow nonstandard C',False)
182  )  )
183    
   
   
184  ############ Specify which compilers to use ####################  ############ Specify which compilers to use ####################
185    
186  # intelc uses regular expressions improperly and emits a warning about  # intelc uses regular expressions improperly and emits a warning about
# Line 193  if IS_WINDOWS_PLATFORM: Line 191  if IS_WINDOWS_PLATFORM:
191        env = Environment(tools = ['default'] + env['tools_names'],        env = Environment(tools = ['default'] + env['tools_names'],
192                          options = opts)                          options = opts)
193  else:  else:
194     if effective_hostname == 'savanna':      if os.uname()[4]=='ia64':
       env = Environment(tools = ['default', 'intelc'], options = opts)  
    elif os.uname()[4]=='ia64':  
195        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
196        if env['CXX'] == 'icpc':        if env['CXX'] == 'icpc':
197           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not)           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not)
198     else:     else:
199        env = Environment(tools = ['default'], options = opts)        env = Environment(tools = ['default'], options = opts)
200          if env['tools_names']!='default':
201        env=Environment(tools = ['default'] +env['tools_names'], options=opts)
202    
203    
204    
205    
206  # Override compiler choice if provided  # Override compiler choice if provided
207  if env['cc'] != 'DEFAULT': env['CC']=env['cc']  if env['cc'] != 'DEFAULT': env['CC']=env['cc']
# Line 628  if env['usesilo']: Line 629  if env['usesilo']:
629    
630  # Add the path to Silo to environment env if it was found.  # Add the path to Silo to environment env if it was found.
631  # Note that we do not add the libs since they are only needed for the  # Note that we do not add the libs since they are only needed for the
632  # escriptexport library and tools.  # weipa library and tools.
633  if env['usesilo']:  if env['usesilo']:
634    env.AppendUnique(CPPPATH = [env['silo_path']])    env.AppendUnique(CPPPATH = [env['silo_path']])
635    env.AppendUnique(LIBPATH = [env['silo_lib_path']])    env.AppendUnique(LIBPATH = [env['silo_lib_path']])
# Line 706  if env_mpi['usempi'] and not conf.CheckC Line 707  if env_mpi['usempi'] and not conf.CheckC
707  if env_mpi['usempi']:  if env_mpi['usempi']:
708    env_mpi = conf.Finish()    env_mpi = conf.Finish()
709    env_mpi.Append(CPPDEFINES = ['PASO_MPI', 'MPI_NO_CPPBIND', env_mpi['MPICH_IGNORE_CXX_SEEK']])    env_mpi.Append(CPPDEFINES = ['PASO_MPI', 'MPI_NO_CPPBIND', env_mpi['MPICH_IGNORE_CXX_SEEK']])
710    if env['usenetcdf']:    # NetCDF 4.1 defines MPI_Comm et al. if MPI_INCLUDED is not defined!
711      env_mpi.Append(CPPDEFINES = ['MPI_INCLUDED']) # needed for NetCDF 4.1    # On the other hand MPT and OpenMPI don't define the latter so we have to
712      # do that here
713      if env['usenetcdf'] and env_mpi['mpi_flavour'] in ["MPT","OPENMPI"]:
714        env_mpi.Append(CPPDEFINES = ['MPI_INCLUDED'])
715  else:  else:
716    conf.Finish()    conf.Finish()
717    
# Line 818  Export( Line 822  Export(
822  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)
823  env.SConscript(dirs = ['tools/escriptconvert'], build_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)  env.SConscript(dirs = ['tools/escriptconvert'], build_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)
824  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)
825  env.SConscript(dirs = ['dataexporter/src'], build_dir='build/$PLATFORM/dataexporter', duplicate=0)  env.SConscript(dirs = ['weipa/src'], build_dir='build/$PLATFORM/weipa', duplicate=0)
826  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)
827  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
828  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
# Line 915  env.Alias('install_esysUtils', ['build_e Line 919  env.Alias('install_esysUtils', ['build_e
919  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])
920  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])
921    
922  env.Alias('build_dataexporter', ['target_install_escriptexport_headers', 'target_escriptexport_so', 'target_escriptexportcpp_so'])  env.Alias('build_weipa', ['target_install_weipa_headers', 'target_weipa_so', 'target_weipacpp_so'])
923  env.Alias('install_dataexporter', ['build_dataexporter', 'target_install_escriptexport_so', 'target_install_escriptexportcpp_so', 'target_install_dataexporter_py'])  env.Alias('install_weipa', ['build_weipa', 'target_install_weipa_so', 'target_install_weipacpp_so', 'target_install_weipa_py'])
924    
925  env.Alias('build_escriptreader', ['target_install_escriptexport_headers', 'target_escriptreader_a'])  env.Alias('build_escriptreader', ['target_install_weipa_headers', 'target_escriptreader_a'])
926  env.Alias('install_escriptreader', ['build_escriptreader', 'target_install_escriptreader_a'])  env.Alias('install_escriptreader', ['build_escriptreader', 'target_install_escriptreader_a'])
927    
928  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'])
# Line 931  env.Alias('install_finley', ['build_finl Line 935  env.Alias('install_finley', ['build_finl
935  build_all_list = []  build_all_list = []
936  build_all_list += ['build_esysUtils']  build_all_list += ['build_esysUtils']
937  build_all_list += ['build_paso']  build_all_list += ['build_paso']
938  build_all_list += ['build_dataexporter']  build_all_list += ['build_weipa']
939  build_all_list += ['build_escript']  build_all_list += ['build_escript']
940  build_all_list += ['build_finley']  build_all_list += ['build_finley']
941  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
# Line 943  install_all_list = [] Line 947  install_all_list = []
947  install_all_list += ['target_init']  install_all_list += ['target_init']
948  install_all_list += ['install_esysUtils']  install_all_list += ['install_esysUtils']
949  install_all_list += ['install_paso']  install_all_list += ['install_paso']
950  install_all_list += ['install_dataexporter']  install_all_list += ['install_weipa']
951  install_all_list += ['install_escript']  install_all_list += ['install_escript']
952  install_all_list += ['install_finley']  install_all_list += ['install_finley']
953  install_all_list += ['target_install_pyvisi_py']  install_all_list += ['target_install_pyvisi_py']

Legend:
Removed from v.3036  
changed lines
  Added in v.3076

  ViewVC Help
Powered by ViewVC 1.1.26