/[escript]/trunk-mpi-branch/SConstruct
ViewVC logotype

Diff of /trunk-mpi-branch/SConstruct

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

revision 1274 by ksteube, Fri Aug 24 01:01:41 2007 UTC revision 1275 by ksteube, Fri Aug 24 04:34:52 2007 UTC
# Line 177  if IS_WINDOWS_PLATFORM: Line 177  if IS_WINDOWS_PLATFORM:
177      cxx_flags_default = ''      cxx_flags_default = ''
178      cxx_flags_debug_default = ''      cxx_flags_debug_default = ''
179      cc_common_flags = '/FD /EHsc /GR /wd4068 '      cc_common_flags = '/FD /EHsc /GR /wd4068 '
     pedantic_flag_default=None  
180  else:  else:
181     cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi'     cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi'
182     cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi'     cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi'
183     cxx_flags_default='--no-warn -ansi'     cxx_flags_default='--no-warn -ansi'
184     cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'     cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'
    pedantic_flag_default=""  
    # pedantic_flag_default="-pedantic-errors -Wno-long-long"  
185  #==============================================================================================      #==============================================================================================    
186  # Default options and options help text  # Default options and options help text
187  # These are defaults and can be overridden using command line arguments or an options file.  # These are defaults and can be overridden using command line arguments or an options file.
# Line 214  opts.AddOptions( Line 211  opts.AddOptions(
211    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),
212    ('omp_flags', 'OpenMP compiler flags to use (Release build)', ''),    ('omp_flags', 'OpenMP compiler flags to use (Release build)', ''),
213    ('omp_flags_debug', 'OpenMP compiler flags to use (Debug build)', ''),    ('omp_flags_debug', 'OpenMP compiler flags to use (Debug build)', ''),
   ('pedantic_flag', 'flag to switch on pedantic compilation', pedantic_flag_default),  
214    ('ar_flags', 'Static library archiver flags to use', None),    ('ar_flags', 'Static library archiver flags to use', None),
215    ('sys_libs', 'System libraries to link with', None),    ('sys_libs', 'System libraries to link with', None),
216    ('tar_flags','flags for zip files','-c -z'),    ('tar_flags','flags for zip files','-c -z'),
# Line 316  try: Line 312  try:
312  except KeyError:  except KeyError:
313     path = ''     path = ''
314    
315    # Copy some variables from the system environment to the build environment
316  try:  try:
317     ld_library_path = os.environ['LD_LIBRARY_PATH']     ld_library_path = os.environ['LD_LIBRARY_PATH']
318     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path
319       home_temp = os.environ['HOME']   # MPICH2's mpd needs $HOME to find $HOME/.mpd.conf
320       env['ENV']['HOME'] = home_temp
321  except KeyError:  except KeyError:
322     ld_library_path = ''     ld_library_path = ''
323  #==========================================================================  #==========================================================================
# Line 426  else: Line 425  else:
425       except KeyError:       except KeyError:
426          pass          pass
427  try:  try:
428        pedantic_flag = env['pedantic_flag']       if env['CC'] == 'gcc': env.Append(CCFLAGS = "-pedantic-errors -Wno-long-long")
429  except KeyError:  except:
430        pedantic_flag = None       pass
431    
432  # ============= set mkl (but only of no MPI) =====================================  # ============= set mkl (but only of no MPI) =====================================
433  if not useMPI:  if not useMPI:
# Line 789  env.Alias(init_target) Line 788  env.Alias(init_target)
788  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "blas_libs", "netCDF_libs", "useNetCDF",  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "blas_libs", "netCDF_libs", "useNetCDF",
789      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
790          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile", "trilinos_libs", "mpi_libs", "papi_instrument_solver",          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile", "trilinos_libs", "mpi_libs", "papi_instrument_solver",
791          "guide_pdf", "guide_html_index", "api_epydoc", "useMPI", "pedantic_flag" ])          "guide_pdf", "guide_html_index", "api_epydoc", "useMPI" ])
792    
793  # End initialisation section  # End initialisation section
794  # Begin configuration section  # Begin configuration section

Legend:
Removed from v.1274  
changed lines
  Added in v.1275

  ViewVC Help
Powered by ViewVC 1.1.26