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

Diff of /branches/refine/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 2027 by phornby, Tue Nov 11 02:52:24 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  )  )
133    
134  ############ Specify which compilers to use ####################  ############ Specify which compilers to use ####################
# Line 134  opts.AddOptions( Line 137  opts.AddOptions(
137  # failing to find the compilers.  This warning can be safely ignored.  # failing to find the compilers.  This warning can be safely ignored.
138    
139  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
140        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(options = opts)
141        #env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default'] + env['tools_names'],
142                            options = opts)
143  else:  else:
144     if socket.gethostname().split('.')[0] == 'service0':     if socket.gethostname().split('.')[0] == 'service0':
145        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
# Line 165  if env["CC"] == "icc": Line 169  if env["CC"] == "icc":
169    omp_debug     = "-openmp -openmp_report0"    omp_debug     = "-openmp -openmp_report0"
170    omp_libs      = ['guide', 'pthread']    omp_libs      = ['guide', 'pthread']
171    pedantic      = ""    pedantic      = ""
172      fatalwarning      = ""        # Switch to turn warnings into errors
173  elif env["CC"] == "gcc":  elif env["CC"] == "gcc":
174    # GNU C on any system    # GNU C on any system
175    cc_flags      = "-fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER"    cc_flags      = "-Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER -isystem /usr/include/boost/ -isystem /usr/include/python2.5/ -Wno-sign-compare"
176    cc_optim      = "-O3"    cc_optim      = "-O3"
177    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
178    omp_optim     = ""    omp_optim     = ""
179    omp_debug     = ""    omp_debug     = ""
180    omp_libs      = []    omp_libs      = []
181    pedantic      = "-pedantic-errors -Wno-long-long"    pedantic      = "-pedantic-errors -Wno-long-long"
182      fatalwarning      = "-Werror"
183  elif env["CC"] == "cl":  elif env["CC"] == "cl":
184    # Microsoft Visual C on Windows    # Microsoft Visual C on Windows
185    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 189  elif env["CC"] == "cl":
189    omp_debug     = ""    omp_debug     = ""
190    omp_libs      = []    omp_libs      = []
191    pedantic      = ""    pedantic      = ""
192      fatalwarning      = ""
193  elif env["CC"] == "icl":  elif env["CC"] == "icl":
194    # intel C on Windows, see windows_msvc71_options.py for a start    # intel C on Windows, see windows_intelc_options.py for a start
195    pedantic      = ""    pedantic      = ""
196      fatalwarning      = ""
197    
198  # If not specified in hostname_options.py then set them here  # If not specified in hostname_options.py then set them here
199  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 263  env.Append(CPPPATH     = [Dir('include')])
263  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
264  env.Append(LIBPATH      = [Dir(env['libinstall'])])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
265    
 env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])  
   
266  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])
267  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])
268    
# Line 505  else: Line 511  else:
511    
512  env['useparmetis'] = env_mpi['useparmetis']  env['useparmetis'] = env_mpi['useparmetis']
513    
514    ############ Now we switch on Warnings as errors ###############
515    
516    #this needs to be done after configuration because the scons test files have warnings in them
517    
518    if ((fatalwarning != "") and (env['usewarnings'])):
519      env.Append(CCFLAGS        = fatalwarning)
520      env_mpi.Append(CCFLAGS        = fatalwarning)
521    
522  ############ Summarize our environment #########################  ############ Summarize our environment #########################
523    
524  print ""  print ""
# Line 531  else: print "  Not using PAPI" Line 545  else: print "  Not using PAPI"
545  if env['usedebug']: print " Compiling for debug"  if env['usedebug']: print " Compiling for debug"
546  else: print "   Not compiling for debug"  else: print "   Not compiling for debug"
547  print " Installing in", prefix  print " Installing in", prefix
548    if ((fatalwarning != "") and (env['usewarnings'])): print " Treating warnings as errors"
549    else: print "   Not treating warnings as errors"
550  print ""  print ""
551    
552  ############ Delete option-dependent files #####################  ############ Delete option-dependent files #####################
# Line 553  env.Append(BUILDERS = {'RunPyUnitTest' : Line 569  env.Append(BUILDERS = {'RunPyUnitTest' :
569    
570  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
571    
572  Export(["env", "env_mpi", "clone_env"])  Export(
573      ["env",
574       "env_mpi",
575       "clone_env",
576       "IS_WINDOWS_PLATFORM"
577       ]
578      )
579    
580  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)
581  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.2027

  ViewVC Help
Powered by ViewVC 1.1.26