/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1708 by ksteube, Thu Aug 14 22:42:24 2008 UTC revision 1753 by ksteube, Sun Sep 7 22:01:23 2008 UTC
# Line 186  if not env["useopenmp"]: Line 186  if not env["useopenmp"]:
186    
187  if env['omp_optim'] == "" and env['omp_debug'] == "": env["useopenmp"] = 0  if env['omp_optim'] == "" and env['omp_debug'] == "": env["useopenmp"] = 0
188    
189    Execute(Delete(env['libinstall'] + "/Compiled.with.debug"))
190    Execute(Delete(env['libinstall'] + "/Compiled.with.mpi"))
191    Execute(Delete(env['libinstall'] + "/Compiled.with.openmp"))
192    if not env['useMPI']: Execute(Delete(env['libinstall'] + "/pythonMPI"))
193    
194  ############ Copy environment variables into scons env #########  ############ Copy environment variables into scons env #########
195    
196  try: env['ENV']['OMP_NUM_THREADS'] = os.environ['OMP_NUM_THREADS']  try: env['ENV']['OMP_NUM_THREADS'] = os.environ['OMP_NUM_THREADS']
# Line 234  def clone_env(env): Line 239  def clone_env(env):
239  env.Append(CPPPATH      = [Dir('include')])  env.Append(CPPPATH      = [Dir('include')])
240    
241  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
242  env.Append(LIBPATH      = [Dir('lib')])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
243    
244  env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])  env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])
245    
# Line 533  remember_list = [] Line 538  remember_list = []
538    
539  if env['usedebug']:  if env['usedebug']:
540    remember_list += env.Command(env['libinstall'] + "/Compiled.with.debug", None, Touch('$TARGET'))    remember_list += env.Command(env['libinstall'] + "/Compiled.with.debug", None, Touch('$TARGET'))
 else:  
   remember_list += env.Command(env['libinstall'] + "/Compiled.with.debug", None, Delete('$TARGET'))  
541    
542  if env['usempi']:  if env['usempi']:
543    remember_list += env.Command(env['libinstall'] + "/Compiled.with.mpi", None, Touch('$TARGET'))    remember_list += env.Command(env['libinstall'] + "/Compiled.with.mpi", None, Touch('$TARGET'))
 else:  
   remember_list += env.Command(env['libinstall'] + "/Compiled.with.mpi", None, Delete('$TARGET'))  
544    
545  if env['omp_optim'] != '':  if env['omp_optim'] != '':
546    remember_list += env.Command(env['libinstall'] + "/Compiled.with.openmp", None, Touch('$TARGET'))    remember_list += env.Command(env['libinstall'] + "/Compiled.with.openmp", None, Touch('$TARGET'))
 else:  
   remember_list += env.Command(env['libinstall'] + "/Compiled.with.openmp", None, Delete('$TARGET'))  
547    
548  env.Alias('remember_options', remember_list)  env.Alias('remember_options', remember_list)
549    

Legend:
Removed from v.1708  
changed lines
  Added in v.1753

  ViewVC Help
Powered by ViewVC 1.1.26