/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 628 by johnpye, Wed May 24 01:45:02 2006 UTC revision 629 by johnpye, Wed May 24 04:34:25 2006 UTC
# Line 850  if need_blas: Line 850  if need_blas:
850  # FORTRAN  # FORTRAN
851    
852  if need_fortran:  if need_fortran:
853      conf.env.Tool('f77')      conf.env.Tool('fortran')
854      detect_fortran = conf.env.Detect(['g77','f77'])      detect_fortran = conf.env.Detect(['g77','f77','gfortran'])
855      if detect_fortran:      if detect_fortran:
856          # For some reason, g77 doesn't get detected properly on MinGW          # For some reason, g77 doesn't get detected properly on MinGW
857          if not env.has_key('F77'):          if not env.has_key('F77'):
# Line 868  if need_fortran: Line 868  if need_fortran:
868              )              )
869              conf.env.Append(BUILDERS={'Fortran':fortran_builder})              conf.env.Append(BUILDERS={'Fortran':fortran_builder})
870      else:      else:
871          print "FORTRAN-77 required but not found"          with_tcltk=False;
872          Exit(1)          without_tcltk_reason="FORTRAN-77 required but not found"
873    
874  #else:  #else:
875  #   print "FORTRAN not required"  #   print "FORTRAN not required"
876    
# Line 1046  SConsEnvironment.InstallPerm = InstallPe Line 1047  SConsEnvironment.InstallPerm = InstallPe
1047  # define wrappers      # define wrappers    
1048  SConsEnvironment.InstallProgram = lambda env, dest, files: InstallPerm(env, dest, files, 0755)    SConsEnvironment.InstallProgram = lambda env, dest, files: InstallPerm(env, dest, files, 0755)  
1049  SConsEnvironment.InstallHeader = lambda env, dest, files: InstallPerm(env, dest, files, 0644)  SConsEnvironment.InstallHeader = lambda env, dest, files: InstallPerm(env, dest, files, 0644)
1050    SConsEnvironment.InstallShared = lambda env, dest, files: InstallPerm(env, dest, files, 0644)
1051    
1052  #------------------------------------------------------  #------------------------------------------------------
1053  # BUILD...  # BUILD...
# Line 1140  if env.get('CAN_INSTALL'): Line 1142  if env.get('CAN_INSTALL'):
1142      # TODO: add install options      # TODO: add install options
1143      env.Alias('install',install_dirs)      env.Alias('install',install_dirs)
1144    
1145      env.Install(env['INSTALL_ROOT']+env['INSTALL_LIB'],libascend)      env.InstallShared(env['INSTALL_ROOT']+env['INSTALL_LIB'],libascend)
1146    
1147  #------------------------------------------------------  #------------------------------------------------------
1148  # CREATE the SPEC file for generation of RPM packages  # CREATE the SPEC file for generation of RPM packages
# Line 1170  tar = env.DistTar("dist/"+env['DISTTAR_N Line 1172  tar = env.DistTar("dist/"+env['DISTTAR_N
1172  #------------------------------------------------------  #------------------------------------------------------
1173  # DEFAULT TARGETS  # DEFAULT TARGETS
1174    
1175  env.Default(['pygtk','tcltk'])  default_targets =[]
1176    if with_tcltk:
1177        default_targets.append('tcltk')
1178    if with_python:
1179        default_targets.append('pygtk')
1180    
1181    env.Default(default_targets)
1182    
1183    print "Building targets:"," ".join([str(i) for i in BUILD_TARGETS])
1184    

Legend:
Removed from v.628  
changed lines
  Added in v.629

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22