/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1930 by phornby, Fri Oct 24 09:35:55 2008 UTC revision 2101 by gross, Wed Nov 26 08:29:08 2008 UTC
# Line 73  opts.AddOptions( Line 73  opts.AddOptions(
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', 'yes'),
76    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'yes'),    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'no'),
77      BoolOption('usewarnings','Compile with warnings as errors if using gcc','yes'),
78  # Python  # Python
79    ('python_path', 'Path to Python includes', '/usr/include/'+python_version),    ('python_path', 'Path to Python includes', '/usr/include/'+python_version),
80    ('python_lib_path', 'Path to Python libs', usr_lib),    ('python_lib_path', 'Path to Python libs', usr_lib),
# Line 125  opts.AddOptions( Line 126  opts.AddOptions(
126  # BLAS (used by UMFPACK)  # BLAS (used by UMFPACK)
127    ('blas_path', 'Path to BLAS includes', '/usr/include/suitesparse'),    ('blas_path', 'Path to BLAS includes', '/usr/include/suitesparse'),
128    ('blas_lib_path', 'Path to BLAS libs', usr_lib),    ('blas_lib_path', 'Path to BLAS libs', usr_lib),
129    ('blas_libs', 'BLAS libraries to link with', ['blas'])    ('blas_libs', 'BLAS libraries to link with', ['blas']),
130    # An option for specifying the compiler tools set (see windows branch).
131      ('tools_names', 'allow control over the tools in the env setup', ['intelc']),
132    # finer control over library building, intel aggressive global optimisation
133    # works with dynamic libraries on windows.
134      ('share_esysUtils', 'control static or dynamic esysUtils lib', False),
135      ('share_paso', 'control static or dynamic paso lib', False)
136  )  )
137    
138  ############ Specify which compilers to use ####################  ############ Specify which compilers to use ####################
# Line 134  opts.AddOptions( Line 141  opts.AddOptions(
141  # failing to find the compilers.  This warning can be safely ignored.  # failing to find the compilers.  This warning can be safely ignored.
142    
143  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
144        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(options = opts)
145        #env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default'] + env['tools_names'],
146                            options = opts)
147  else:  else:
148     if socket.gethostname().split('.')[0] == 'service0':     if socket.gethostname().split('.')[0] == 'service0':
149        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
# Line 165  if env["CC"] == "icc": Line 173  if env["CC"] == "icc":
173    omp_debug     = "-openmp -openmp_report0"    omp_debug     = "-openmp -openmp_report0"
174    omp_libs      = ['guide', 'pthread']    omp_libs      = ['guide', 'pthread']
175    pedantic      = ""    pedantic      = ""
176      fatalwarning      = ""        # Switch to turn warnings into errors
177  elif env["CC"] == "gcc":  elif env["CC"] == "gcc":
178    # GNU C on any system    # GNU C on any system
179    cc_flags      = "-fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER"    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"
180    #the strict aliasing warning is triggered by some type punning in the boost headers for version 1.34
181    #isystem does not seem to prevent this
182    #the long long warning occurs on the Mac
183    cc_optim      = "-O3"    cc_optim      = "-O3"
184    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
185    omp_optim     = ""    omp_optim     = ""
186    omp_debug     = ""    omp_debug     = ""
187    omp_libs      = []    omp_libs      = []
188    pedantic      = "-pedantic-errors -Wno-long-long"    pedantic      = "-pedantic-errors -Wno-long-long"
189      fatalwarning      = "-Werror"
190  elif env["CC"] == "cl":  elif env["CC"] == "cl":
191    # Microsoft Visual C on Windows    # Microsoft Visual C on Windows
192    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 183  elif env["CC"] == "cl": Line 196  elif env["CC"] == "cl":
196    omp_debug     = ""    omp_debug     = ""
197    omp_libs      = []    omp_libs      = []
198    pedantic      = ""    pedantic      = ""
199      fatalwarning      = ""
200  elif env["CC"] == "icl":  elif env["CC"] == "icl":
201    # intel C on Windows, see windows_msvc71_options.py for a start    # intel C on Windows, see windows_intelc_options.py for a start
202    pedantic      = ""    pedantic      = ""
203      fatalwarning      = ""
204    
205  # If not specified in hostname_options.py then set them here  # If not specified in hostname_options.py then set them here
206  if env["cc_flags"]  == "-DEFAULT_1": env['cc_flags'] = cc_flags  if env["cc_flags"]  == "-DEFAULT_1": env['cc_flags'] = cc_flags
# Line 255  env.Append(CPPPATH     = [Dir('include')]) Line 270  env.Append(CPPPATH     = [Dir('include')])
270  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
271  env.Append(LIBPATH      = [Dir(env['libinstall'])])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
272    
 env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])  
   
273  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])
274  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])
275    
# Line 266  if env['usepedantic']: env.Append(CCFLAG Line 279  if env['usepedantic']: env.Append(CCFLAG
279  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
280    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.PrependENVPath('PATH',    [env['boost_lib_path']])
281    env.PrependENVPath('PATH',    [env['libinstall']])    env.PrependENVPath('PATH',    [env['libinstall']])
282      if not env['share_esysUtils'] :
283        env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
284      if not env['share_paso'] :
285        env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
286    
287    if env['usenetcdf']:    if env['usenetcdf']:
288      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])
289    
# Line 432  if env['useumfpack']: Line 450  if env['useumfpack']:
450    
451  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
452  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0
453    if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?
454    
455  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
456  if env['useumfpack']:  if env['useumfpack']:
# Line 505  else: Line 524  else:
524    
525  env['useparmetis'] = env_mpi['useparmetis']  env['useparmetis'] = env_mpi['useparmetis']
526    
527    ############ Now we switch on Warnings as errors ###############
528    
529    #this needs to be done after configuration because the scons test files have warnings in them
530    
531    if ((fatalwarning != "") and (env['usewarnings'])):
532      env.Append(CCFLAGS        = fatalwarning)
533      env_mpi.Append(CCFLAGS        = fatalwarning)
534    
535  ############ Summarize our environment #########################  ############ Summarize our environment #########################
536    
537  print ""  print ""
# Line 531  else: print "  Not using PAPI" Line 558  else: print "  Not using PAPI"
558  if env['usedebug']: print " Compiling for debug"  if env['usedebug']: print " Compiling for debug"
559  else: print "   Not compiling for debug"  else: print "   Not compiling for debug"
560  print " Installing in", prefix  print " Installing in", prefix
561    if ((fatalwarning != "") and (env['usewarnings'])): print " Treating warnings as errors"
562    else: print "   Not treating warnings as errors"
563  print ""  print ""
564    
565  ############ Delete option-dependent files #####################  ############ Delete option-dependent files #####################
# Line 553  env.Append(BUILDERS = {'RunPyUnitTest' : Line 582  env.Append(BUILDERS = {'RunPyUnitTest' :
582    
583  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
584    
585  Export(["env", "env_mpi", "clone_env"])  Export(
586      ["env",
587       "env_mpi",
588       "clone_env",
589       "IS_WINDOWS_PLATFORM"
590       ]
591      )
592    
593  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)
594  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)

Legend:
Removed from v.1930  
changed lines
  Added in v.2101

  ViewVC Help
Powered by ViewVC 1.1.26