/[escript]/trunk/site_scons/dependencies.py
ViewVC logotype

Diff of /trunk/site_scons/dependencies.py

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

revision 6140 by caltinay, Wed Apr 6 02:58:19 2016 UTC revision 6141 by caltinay, Wed Apr 6 03:51:30 2016 UTC
# Line 472  def checkOptionalLibraries(env): Line 472  def checkOptionalLibraries(env):
472          env.AppendUnique(LIBPATH = [boomeramg_lib_path])          env.AppendUnique(LIBPATH = [boomeramg_lib_path])
473          env.AppendUnique(LIBS = env['boomeramg_libs'])          env.AppendUnique(LIBS = env['boomeramg_libs'])
474          env.PrependENVPath(env['LD_LIBRARY_PATH_KEY'], boomeramg_lib_path)          env.PrependENVPath(env['LD_LIBRARY_PATH_KEY'], boomeramg_lib_path)
475          env.Append(CPPDEFINES = ['BOOMERAMG'])          env.Append(CPPDEFINES = ['ESYS_HAVE_BOOMERAMG'])
476          env['buildvars']['boomeramg_inc_path']=boomeramg_inc_path          env['buildvars']['boomeramg_inc_path']=boomeramg_inc_path
477          env['buildvars']['boomeramg_lib_path']=boomeramg_lib_path          env['buildvars']['boomeramg_lib_path']=boomeramg_lib_path
478      env['buildvars']['boomeramg']=int(env['boomeramg'])      env['buildvars']['boomeramg']=int(env['boomeramg'])
# Line 521  def checkOptionalLibraries(env): Line 521  def checkOptionalLibraries(env):
521          else:          else:
522              env['parmetis_version'] = "unknown"              env['parmetis_version'] = "unknown"
523    
524          env.Append(CPPDEFINES = ['USE_PARMETIS'])          env.Append(CPPDEFINES = ['ESYS_HAVE_PARMETIS'])
525          env['buildvars']['parmetis_inc_path']=parmetis_inc_path          env['buildvars']['parmetis_inc_path']=parmetis_inc_path
526          env['buildvars']['parmetis_lib_path']=parmetis_lib_path          env['buildvars']['parmetis_lib_path']=parmetis_lib_path
527      env['buildvars']['parmetis']=int(env['parmetis'])      env['buildvars']['parmetis']=int(env['parmetis'])
# Line 550  def checkOptionalLibraries(env): Line 550  def checkOptionalLibraries(env):
550                  p=Popen(cmd, stdout=PIPE)                  p=Popen(cmd, stdout=PIPE)
551                  gmshlibs,_ = p.communicate()                  gmshlibs,_ = p.communicate()
552                  ret = p.wait()                  ret = p.wait()
553                    env.Append(CPPDEFINES=['ESYS_HAVE_GMSH'])
554                  if ret == 0 and 'libmpi' in gmshlibs:                  if ret == 0 and 'libmpi' in gmshlibs:
555                      env['gmsh'] = 'm'                      env['gmsh'] = 'm'
556                      env.Append(CPPDEFINES=['GMSH','GMSH_MPI'])                      env.Append(CPPDEFINES=['ESYS_GMSH_MPI'])
557                  else:                  else:
558                      env['gmsh'] = 's'                      env['gmsh'] = 's'
                     env.Append(CPPDEFINES=['GMSH'])  
559              except OSError:              except OSError:
560                  pass                  pass
561            
# Line 563  def checkOptionalLibraries(env): Line 563  def checkOptionalLibraries(env):
563      if env['compressed_files']:      if env['compressed_files']:
564          try:          try:
565              boost_inc_path, boost_lib_path = findLibWithHeader(env, env['compression_libs'], 'boost/iostreams/filter/gzip.hpp', env['boost_prefix'], lang='c++')              boost_inc_path, boost_lib_path = findLibWithHeader(env, env['compression_libs'], 'boost/iostreams/filter/gzip.hpp', env['boost_prefix'], lang='c++')
566              env.Append(CPPDEFINES = ['USE_BOOSTIO'])              #env.Append(CPPDEFINES = ['ESYS_HAVE_BOOST_IO'])
567              env.AppendUnique(LIBS = env['compression_libs'])              env.AppendUnique(LIBS = env['compression_libs'])
568          except RuntimeError as e:          except RuntimeError as e:
569              env['compressed_files'] = False              env['compressed_files'] = False

Legend:
Removed from v.6140  
changed lines
  Added in v.6141

  ViewVC Help
Powered by ViewVC 1.1.26