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

Diff of /branches/diaplayground/SConstruct

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

revision 2820 by artak, Thu Dec 10 05:03:11 2009 UTC revision 2827 by jfenwick, Fri Dec 18 03:41:09 2009 UTC
# Line 173  adder( Line 173  adder(
173  # works with dynamic libraries on windows.  # works with dynamic libraries on windows.
174    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),
175    ('share_paso', 'control static or dynamic paso lib', False),    ('share_paso', 'control static or dynamic paso lib', False),
176    ('env_export','Environment variables to be passed to children',[])    ('env_export','Environment variables to be passed to children',[]),
177    #To enable passing function pointers through python
178      BoolVariable('iknowwhatimdoing','allow nonstandard C',False)
179  )  )
180    
181    
# Line 291  if env['forcecollres']    != "leave_alon Line 293  if env['forcecollres']    != "leave_alon
293      env.Append(CPPDEFINES=['FRESCOLLECTOFF'])      env.Append(CPPDEFINES=['FRESCOLLECTOFF'])
294    
295    
296    if env['iknowwhatimdoing']:
297        env.Append(CPPDEFINES=['IKNOWWHATIMDOING'])
298    
299  # OpenMP is disabled if useopenmp=no or both variables omp_optim and omp_debug are empty  # OpenMP is disabled if useopenmp=no or both variables omp_optim and omp_debug are empty
300  if not env["useopenmp"]:  if not env["useopenmp"]:
301    env['omp_optim'] = ""    env['omp_optim'] = ""
# Line 612  if env['usesilo']: Line 617  if env['usesilo']:
617    
618  ########### Lapack (optional) ##################################  ########### Lapack (optional) ##################################
619    
   
620  if env['uselapack']:  if env['uselapack']:
621      env.AppendUnique(CPPDEFINES='USE_LAPACK')      env.AppendUnique(CPPDEFINES='USE_LAPACK')
622      env.AppendUnique(CPPPATH = [env['lapack_path']])      env.AppendUnique(CPPPATH = [env['lapack_path']])
# Line 628  if env['uselapack']: Line 632  if env['uselapack']:
632          env.AppendUnique(CPPDEFINES='MKL_LAPACK')          env.AppendUnique(CPPDEFINES='MKL_LAPACK')
633                
634    
   
635  ############ Add the compiler flags ############################  ############ Add the compiler flags ############################
636    
637  # Enable debug by choosing either cc_debug or cc_optim  # Enable debug by choosing either cc_debug or cc_optim
# Line 690  else: Line 693  else:
693    
694  env['usempi'] = env_mpi['usempi']  env['usempi'] = env_mpi['usempi']
695    
   
696  ############ ParMETIS (optional) ###############################  ############ ParMETIS (optional) ###############################
697    
698  # Start a new configure environment that reflects what we've already found  # Start a new configure environment that reflects what we've already found
# Line 719  else: Line 721  else:
721    
722  env['useparmetis'] = env_mpi['useparmetis']  env['useparmetis'] = env_mpi['useparmetis']
723    
 ############ Now we switch on Warnings as errors ###############  
   
 #this needs to be done after configuration because the scons test files have warnings in them  
   
 if ((fatalwarning != "") and (env['usewarnings'])):  
   env.Append(CCFLAGS        = fatalwarning)  
   env_mpi.Append(CCFLAGS        = fatalwarning)  
   
724  ############ Summarize our environment #########################  ############ Summarize our environment #########################
725    
726  print ""  print ""
# Line 773  if not env['usempi']: Execute(Delete(os. Line 767  if not env['usempi']: Execute(Delete(os.
767    
768  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
769    
770    if env['usepedantic']: env_mpi.Append(CCFLAGS = pedantic)
771    
772    
773  from grouptest import *  from grouptest import *
774    
775  TestGroups=[]  TestGroups=[]
776    
777    dodgy_env=clone_env(env_mpi)    # Environment without pedantic options
778    
779    ############ Now we switch on Warnings as errors ###############
780    
781    #this needs to be done after configuration because the scons test files have warnings in them
782    
783    if ((fatalwarning != "") and (env['usewarnings'])):
784      env.Append(CCFLAGS        = fatalwarning)
785      env_mpi.Append(CCFLAGS        = fatalwarning)
786    
787    
788  Export(  Export(
789    ["env",    ["env",
790     "env_mpi",     "env_mpi",
791     "clone_env",     "clone_env",
792       "dodgy_env",
793     "IS_WINDOWS_PLATFORM",     "IS_WINDOWS_PLATFORM",
794     "TestGroups"     "TestGroups"
795     ]     ]

Legend:
Removed from v.2820  
changed lines
  Added in v.2827

  ViewVC Help
Powered by ViewVC 1.1.26