Changeset 1873 for trunk/src


Ignore:
Timestamp:
08/13/10 15:03:53 (14 years ago)
Author:
Malte Marquarding
Message:

Move to compile in pyrap out of external if it isn't found in the system

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/SConscript

    r1819 r1873  
    88cpps = env.SGlob("*.cpp")
    99pycpps = env.SGlob("python_*.cpp")
    10 for pf in pycpps: cpps.remove(pf)
     10for pf in pycpps:
     11    cpps.remove(pf)
    1112
    1213# location of libcasav.a
     
    1819myenv.Prepend( LIBS =  ['asap'] )
    1920
     21shenv = myenv.Clone()
     22pyrapdir = shenv.get("pyrapint", None)
     23if pyrapdir:
     24    shenv.PrependUnique(CPPPATH=pyrapdir)   
     25    pycpps += shenv.Glob('%s/pyrap/*/*.cc' % pyrapdir)
    2026# Finally create the library for the module
    21 if not hasattr(myenv, "LoadableModule"):
    22     myenv.LoadableModule = myenv.SharedLibrary
    23 so = myenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
    24 #test = myenv.Program("test", cpps)
     27if not hasattr(shenv, "LoadableModule"):
     28    shenv.LoadableModule = shenv.SharedLibrary
     29so = shenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
     30#test = shenv.Program("test", cpps)
    2531Return("so")
    2632
Note: See TracChangeset for help on using the changeset viewer.