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

Diff of /branches/dirac/SConstruct

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

revision 2101 by gross, Wed Nov 26 08:29:08 2008 UTC revision 2132 by jfenwick, Fri Dec 5 00:18:06 2008 UTC
# Line 164  if env['useMPI']: env['usempi'] = 1 Line 164  if env['useMPI']: env['usempi'] = 1
164  # Default compiler options (override allowed in hostname_options.py, but should not be necessary)  # Default compiler options (override allowed in hostname_options.py, but should not be necessary)
165  # For both C and C++ you get: cc_flags and either the optim flags or debug flags  # For both C and C++ you get: cc_flags and either the optim flags or debug flags
166    
167    sysheaderopt = ""       # how do we indicate that a header is a system header. Use "" for no action.
168    
169  if env["CC"] == "icc":  if env["CC"] == "icc":
170    # Intel compilers    # Intel compilers
171    cc_flags      = "-fPIC -ansi -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"    cc_flags      = "-fPIC -ansi -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"
# Line 174  if env["CC"] == "icc": Line 176  if env["CC"] == "icc":
176    omp_libs      = ['guide', 'pthread']    omp_libs      = ['guide', 'pthread']
177    pedantic      = ""    pedantic      = ""
178    fatalwarning      = ""        # Switch to turn warnings into errors    fatalwarning      = ""        # Switch to turn warnings into errors
179      sysheaderopt      = ""
180  elif env["CC"] == "gcc":  elif env["CC"] == "gcc":
181    # GNU C on any system    # GNU C on any system
182    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER -isystem " + env['boost_path'] + "/boost -isystem " + env['python_path'] + " -Wno-sign-compare -Wno-system-headers -Wno-strict-aliasing -Wno-long-long"    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER  -Wno-sign-compare -Wno-system-headers -Wno-long-long -Wno-strict-aliasing"
183  #the strict aliasing warning is triggered by some type punning in the boost headers for version 1.34  #The strict aliasing error occurs for some versions of boost
 #isystem does not seem to prevent this  
184  #the long long warning occurs on the Mac  #the long long warning occurs on the Mac
185    cc_optim      = "-O3"    cc_optim      = "-O3"
186    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
# Line 187  elif env["CC"] == "gcc": Line 189  elif env["CC"] == "gcc":
189    omp_libs      = []    omp_libs      = []
190    pedantic      = "-pedantic-errors -Wno-long-long"    pedantic      = "-pedantic-errors -Wno-long-long"
191    fatalwarning      = "-Werror"    fatalwarning      = "-Werror"
192      sysheaderopt      = "-isystem "
193  elif env["CC"] == "cl":  elif env["CC"] == "cl":
194    # Microsoft Visual C on Windows    # Microsoft Visual C on Windows
195    cc_flags      = "/FD /EHsc /GR /wd4068 -D_USE_MATH_DEFINES -DDLL_NETCDF"    cc_flags      = "/FD /EHsc /GR /wd4068 -D_USE_MATH_DEFINES -DDLL_NETCDF"
# Line 197  elif env["CC"] == "cl": Line 200  elif env["CC"] == "cl":
200    omp_libs      = []    omp_libs      = []
201    pedantic      = ""    pedantic      = ""
202    fatalwarning      = ""    fatalwarning      = ""
203      sysheaderopt      = ""
204  elif env["CC"] == "icl":  elif env["CC"] == "icl":
205    # intel C on Windows, see windows_intelc_options.py for a start    # intel C on Windows, see windows_intelc_options.py for a start
206    pedantic      = ""    pedantic      = ""
207    fatalwarning      = ""    fatalwarning      = ""
208      sysheaderopt      = ""
209    
210    
211  # If not specified in hostname_options.py then set them here  # If not specified in hostname_options.py then set them here
212  if env["cc_flags"]  == "-DEFAULT_1": env['cc_flags'] = cc_flags  if env["cc_flags"]  == "-DEFAULT_1": env['cc_flags'] = cc_flags
# Line 322  if conf.CheckFunc('gethostname'): Line 328  if conf.CheckFunc('gethostname'):
328    
329  ############ python libraries (required) #######################  ############ python libraries (required) #######################
330    
331  conf.env.AppendUnique(CPPPATH       = [env['python_path']])  
332    if not sysheaderopt =="":
333      conf.env.Append(CCFLAGS=sysheaderopt+env['python_path'])
334    else:
335      conf.env.AppendUnique(CPPPATH     = [env['python_path']])
336    
337  conf.env.AppendUnique(LIBPATH       = [env['python_lib_path']])  conf.env.AppendUnique(LIBPATH       = [env['python_lib_path']])
338  conf.env.AppendUnique(LIBS      = [env['python_libs']])  conf.env.AppendUnique(LIBS      = [env['python_libs']])
339    
# Line 337  if not conf.CheckFunc('Py_Main'): Line 348  if not conf.CheckFunc('Py_Main'):
348    
349  ############ boost (required) ##################################  ############ boost (required) ##################################
350    
351  conf.env.AppendUnique(CPPPATH       = [env['boost_path']])  if not sysheaderopt =="":
352      conf.env.Append(CCFLAGS=sysheaderopt+env['boost_path']+'boost')
353    else:
354      conf.env.AppendUnique(CPPPATH     = [env['boost_path']])
355    
356  conf.env.AppendUnique(LIBPATH       = [env['boost_lib_path']])  conf.env.AppendUnique(LIBPATH       = [env['boost_lib_path']])
357  conf.env.AppendUnique(LIBS      = [env['boost_libs']])  conf.env.AppendUnique(LIBS      = [env['boost_libs']])
358    
Legend:
Removed from v.2101  
changed lines
  Added in v.2132
  ViewVC Help
Powered by ViewVC 1.1.26