Changeset 1873 for trunk/src

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:

• trunk/src/SConscript (modified) (2 diffs)

trunk/src/SConscript

@@ -8 +8 @@
 cpps = env.SGlob("*.cpp")
 pycpps = env.SGlob("python_*.cpp")
-for pf in pycpps: cpps.remove(pf)
+for pf in pycpps:
+    cpps.remove(pf)
 
 # location of libcasav.a
@@ -18 +19 @@
 myenv.Prepend( LIBS =  ['asap'] )
 
+shenv = myenv.Clone()
+pyrapdir = shenv.get("pyrapint", None)
+if pyrapdir:
+    shenv.PrependUnique(CPPPATH=pyrapdir)    
+    pycpps += shenv.Glob('%s/pyrap/*/*.cc' % pyrapdir)
 # Finally create the library for the module
-if not hasattr(myenv, "LoadableModule"):
-    myenv.LoadableModule = myenv.SharedLibrary
-so = myenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
-#test = myenv.Program("test", cpps)
+if not hasattr(shenv, "LoadableModule"):
+    shenv.LoadableModule = shenv.SharedLibrary
+so = shenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
+#test = shenv.Program("test", cpps)
 Return("so")