/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2286 by jfenwick, Mon Feb 23 02:50:06 2009 UTC revision 2295 by jfenwick, Wed Mar 4 05:18:28 2009 UTC
# Line 72  opts.AddOptions( Line 72  opts.AddOptions(
72    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
73    ('sys_libs', 'System libraries to link with', []),    ('sys_libs', 'System libraries to link with', []),
74    ('ar_flags', 'Static library archiver flags to use', ''),    ('ar_flags', 'Static library archiver flags to use', ''),
75    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'yes'),    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'no'),
76    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'no'),    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'no'),
77    BoolOption('usewarnings','Compile with warnings as errors if using gcc','yes'),    BoolOption('usewarnings','Compile with warnings as errors if using gcc','yes'),
78    ('forcelazy','for testing use only - set the default value for autolazy','leave_alone'),    ('forcelazy','for testing use only - set the default value for autolazy','leave_alone'),
# Line 362  if not conf.CheckFunc('Py_Exit'): Line 362  if not conf.CheckFunc('Py_Exit'):
362  ############ boost (required) ##################################  ############ boost (required) ##################################
363    
364  if not sysheaderopt =="":  if not sysheaderopt =="":
365    conf.env.Append(CCFLAGS=sysheaderopt+os.path.join(env['boost_path'],'boost'))  # This is required because we can't -isystem /usr/system because it breaks std includes
366      if os.path.normpath(env['boost_path']) =="/usr/include":
367        conf.env.Append(CCFLAGS=sysheaderopt+os.path.join(env['boost_path'],'boost'))
368      else:
369        conf.env.Append(CCFLAGS=sysheaderopt+env['boost_path'])
370  else:  else:
371    conf.env.AppendUnique(CPPPATH     = [env['boost_path']])    conf.env.AppendUnique(CPPPATH     = [env['boost_path']])
372    
# Line 702  build_all_list += ['build_paso'] Line 706  build_all_list += ['build_paso']
706  build_all_list += ['build_escript']  build_all_list += ['build_escript']
707  build_all_list += ['build_finley']  build_all_list += ['build_finley']
708  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
709  if not IS_WINDOWS_PLATFORM: build_all_list += ['target_finley_wrapper']  if not IS_WINDOWS_PLATFORM: build_all_list += ['target_escript_wrapper']
710  if env['usesilo']:  build_all_list += ['target_escript2silo']  if env['usesilo']:  build_all_list += ['target_escript2silo']
711  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
712    
# Line 716  install_all_list += ['target_install_pyv Line 720  install_all_list += ['target_install_pyv
720  install_all_list += ['target_install_modellib_py']  install_all_list += ['target_install_modellib_py']
721  install_all_list += ['target_install_pycad_py']  install_all_list += ['target_install_pycad_py']
722  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']
723  if not IS_WINDOWS_PLATFORM: install_all_list += ['target_install_finley_wrapper']  if not IS_WINDOWS_PLATFORM: install_all_list += ['target_install_escript_wrapper']
724  if env['usesilo']:  install_all_list += ['target_install_escript2silo']  if env['usesilo']:  install_all_list += ['target_install_escript2silo']
725  install_all_list += ['remember_options']  install_all_list += ['remember_options']
726  env.Alias('install_all', install_all_list)  env.Alias('install_all', install_all_list)

Legend:
Removed from v.2286  
changed lines
  Added in v.2295

  ViewVC Help
Powered by ViewVC 1.1.26