Changeset 3034 for trunk/SConstruct

Timestamp:

04/01/15 10:35:15 (10 years ago)

Author:

Malte Marquarding

Message:

Remove reference to libpryap (scons). use casacore_python from now on

File:

• trunk/SConstruct (modified) (2 diffs)

trunk/SConstruct

@@ -111 +111 @@
             Exit(1)
 
-    if env["enable_pyrap"]:
-        conf.env.AddCustomPackage('pyrap')
-        if conf.CheckLib(conf.env["pyraplib"], language='c++', autoadd=0):
-            conf.env.PrependUnique(LIBS=env['pyraplib'])
-        else:
-            Exit(1)
-    else:
-        conf.env.AppendUnique(CPPPATH=[conf.env["numpyincdir"]])
-        if conf.CheckHeader("numpy/numpyconfig.h"):
-            conf.env.Append(CPPDEFINES=["-DAIPS_USENUMPY"])
-        else:
-            conf.env.Exit(1)
-        # compile in pyrap from here...
-        conf.env["pyrapint"] = "#/external/libpyrap/pyrap-0.3.2"
-    conf.env.Append(CPPFLAGS=['-DHAVE_LIBPYRAP'])
-
     if not conf.CheckLib("m"): 
         Exit(1)
@@ -163 +147 @@
             conf.env.AppendUnique(CPPPATH=[pth,pth+'/..'])
             break
-    cclibs = ["casa_images", "casa_ms", #"casa_components", 
+    cclibs = ["casa_python", "casa_images", "casa_ms",
               "casa_coordinates", "casa_lattices", 
               "casa_fits", "casa_measures", "casa_scimath",