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

Diff of /branches/diaplayground/SConstruct

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

revision 5052 by caltinay, Thu May 15 01:40:06 2014 UTC revision 5053 by caltinay, Fri Jun 20 00:36:10 2014 UTC
# Line 69  vars.AddVariables( Line 69  vars.AddVariables(
69    ('cc_debug', 'Additional C++ flags for a debug build', 'default'),    ('cc_debug', 'Additional C++ flags for a debug build', 'default'),
70    ('cxx_extra', 'Extra C++ compiler flags', ''),    ('cxx_extra', 'Extra C++ compiler flags', ''),
71    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
72      ('nvcc', 'Path to CUDA compiler', 'default'),
73      ('nvccflags', 'Base CUDA compiler flags', 'default'),
74    BoolVariable('werror','Treat compiler warnings as errors', True),    BoolVariable('werror','Treat compiler warnings as errors', True),
75    BoolVariable('debug', 'Compile with debug flags', False),    BoolVariable('debug', 'Compile with debug flags', False),
76    BoolVariable('openmp', 'Compile parallel version using OpenMP', False),    BoolVariable('openmp', 'Compile parallel version using OpenMP', False),
# Line 113  vars.AddVariables( Line 115  vars.AddVariables(
115    ('visit_prefix', 'Prefix/Paths to VisIt installation', default_prefix),    ('visit_prefix', 'Prefix/Paths to VisIt installation', default_prefix),
116    ('visit_libs', 'VisIt libraries to link with', ['simV2']),    ('visit_libs', 'VisIt libraries to link with', ['simV2']),
117    BoolVariable('vsl_random', 'Use VSL from intel for random data', False),    BoolVariable('vsl_random', 'Use VSL from intel for random data', False),
118      BoolVariable('cuda', 'Enable GPU code with CUDA (requires thrust)', False),
119      ('thrust_prefix', 'Prefix/Paths to NVidia thrust installation', default_prefix),
120  # Advanced settings  # Advanced settings
121    #dudley_assemble_flags = -funroll-loops      to actually do something    #dudley_assemble_flags = -funroll-loops      to actually do something
122    ('dudley_assemble_flags', 'compiler flags for some dudley optimisations', ''),    ('dudley_assemble_flags', 'compiler flags for some dudley optimisations', ''),
# Line 183  if len(vars.UnknownVariables())>0: Line 187  if len(vars.UnknownVariables())>0:
187          print("Unknown option '%s'" % k)          print("Unknown option '%s'" % k)
188      Exit(1)      Exit(1)
189    
190    env.Tool('nvcc')
191    
192  # create dictionary which will be populated with info for buildvars file  # create dictionary which will be populated with info for buildvars file
193  env['buildvars']={}  env['buildvars']={}
194  # create list which will be populated with warnings if there are any  # create list which will be populated with warnings if there are any
# Line 211  env.Append(LIBPATH = [env['libinstall']] Line 217  env.Append(LIBPATH = [env['libinstall']]
217    
218  if env['cxx'] != 'default': env['CXX']=env['cxx']  if env['cxx'] != 'default': env['CXX']=env['cxx']
219    
220    if env['nvcc'] != 'default':
221        env['NVCC'] = env['nvcc']
222    else:
223        env['NVCC'] = 'nvcc'
224    
225  # version >=9 of intel C++ compiler requires use of icpc to link in C++  # version >=9 of intel C++ compiler requires use of icpc to link in C++
226  # runtimes (icc does not)  # runtimes (icc does not)
227  if not IS_WINDOWS and os.uname()[4]=='ia64' and env['CXX']=='icpc':  if not IS_WINDOWS and os.uname()[4]=='ia64' and env['CXX']=='icpc':
# Line 274  if env['omp_ldflags'] == 'default': env[ Line 285  if env['omp_ldflags'] == 'default': env[
285  if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])  if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])
286  if env['ld_extra']  != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra']  != '': env.Append(LINKFLAGS = env['ld_extra'])
287    
288    if env['nvccflags'] != 'default':
289        env['NVCCFLAGS'] = env['nvccflags']
290        env['SHNVCCFLAGS'] = env['nvccflags']
291    
292  if env['BADPYTHONMACROS']: env.Append(CXXFLAGS = ' -DBADPYTHONMACROS')  if env['BADPYTHONMACROS']: env.Append(CXXFLAGS = ' -DBADPYTHONMACROS')
293    
294  if env['usepython3']:  if env['usepython3']:
# Line 523  env.Alias('target_init', [target_init]) Line 538  env.Alias('target_init', [target_init])
538  # delete buildvars upon cleanup  # delete buildvars upon cleanup
539  env.Clean('target_init', os.path.join(env['libinstall'], 'buildvars'))  env.Clean('target_init', os.path.join(env['libinstall'], 'buildvars'))
540    
541    cusphdr_inst = env.Install(env['incinstall'], Dir('#cusplibrary/cusp'))
542    env.Alias('install_cusp_headers', cusphdr_inst)
543  # The headers have to be installed prior to build in order to satisfy  # The headers have to be installed prior to build in order to satisfy
544  # #include <paso/Common.h>  # #include <paso/Common.h>
545  env.Alias('build_esysUtils', ['install_esysUtils_headers', 'build_esysUtils_lib'])  env.Alias('build_esysUtils', ['install_esysUtils_headers', 'build_esysUtils_lib'])
# Line 543  env.Alias('install_dudley', ['build_dudl Line 560  env.Alias('install_dudley', ['build_dudl
560  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'])
561  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'])
562    
563  env.Alias('build_ripley', ['install_ripley_headers', 'build_ripley_lib', 'build_ripleycpp_lib'])  env.Alias('build_ripley', ['install_cusp_headers', 'install_ripley_headers', 'build_ripley_lib', 'build_ripleycpp_lib'])
564  env.Alias('install_ripley', ['build_ripley', 'install_ripley_lib', 'install_ripleycpp_lib', 'install_ripley_py'])  env.Alias('install_ripley', ['build_ripley', 'install_ripley_lib', 'install_ripleycpp_lib', 'install_ripley_py'])
565    
566  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'])

Legend:
Removed from v.5052  
changed lines
  Added in v.5053

  ViewVC Help
Powered by ViewVC 1.1.26