Changeset 1090

Timestamp:

07/28/06 11:42:22 (18 years ago)

Author:

mar637

Message:

added more auto-detection of libs

Location:

trunk

Files:

• SConstruct (modified) (4 diffs)
• src/SConscript (modified) (1 diff)

trunk/SConstruct

@@ -10 +10 @@
 opts.Add("moduledir", "The python module path (site-packages))", moduledir)
 
+def addCasaLibs(env):
+    casalibs = "casav atnf images ms components coordinates \
+                lattices fits measures measures_f \
+                tables scimath scimath_f casa wcs".split()
+    env.Prepend( LIBS =  casalibs )
+    # Explicit templates in casa
+    env.Append( CPPFLAGS = ['-DAIPS_NO_TEMPLATE_SRC'] )
 
 def checkCasa(conf, path=None):
@@ -19 +26 @@
         conf.env.Append(CASAARCH = casa[1])
         conf.env.Append(CASAROOT = casa[0])
+        addCasaLibs(conf.env)
         conf.Result('yes')
         return True
@@ -33 +41 @@
             conf.env.Append(CASAARCH = casaarch)
             conf.env.Append(CASAROOT = p)
+            addCasaLibs(conf.env)
             conf.Result('yes')
             return True
@@ -49 +58 @@
     if not conf.CheckHeader(pyvers+'/Python.h', language='c'): Exit(1)
     else: conf.env.Append(CPPPATH=[distutils.sysconfig.get_python_inc()])
-        #if not conf.CheckHeader(['boost/python.hpp'], language="C++"): Exit(1)
+    if not conf.CheckHeader(['boost/python.hpp'], language="C++"): Exit(1)
     if not conf.CheckLib(library='boost_python', language='c++'): Exit(1)
-# #     if not conf.CheckLib('g2c'): Exit(1)
-# #     if not conf.CheckLib('lapack'): Exit(1)
-# #     if not conf.CheckLib('blas'): Exit(1)
-# #     if not conf.CheckLib('stdc++',language='c++'): Exit(1)
+    if not conf.CheckLib('rpfits'): Exit(1)
+    if not conf.CheckLib('cfitsio'): Exit(1)
+    if not conf.CheckLib('g2c'): Exit(1)
+    if not conf.CheckLib('lapack'): Exit(1)
+    if not conf.CheckLib('blas'): Exit(1)
+    if not conf.CheckLib('stdc++',language='c++'): Exit(1)
     if not conf.CheckCasa(): Exit(1)
     env = conf.Finish()
+# general CPPFLAGS
 env.Append(CPPFLAGS='-O3 -Wno-long-long'.split())
+# 64bit flags
 if  platform.architecture()[0] == '64bit':
-    env.Append(CPPFLAGS='-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__x86_64__ -DAIPS_64B -DAIPS_GCC3'.split())
+    env.Append(CPPFLAGS='-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__x86_64__ -DAIPS_64B'.split())
 
-#env.BuildDir('build', 'src')
 Export("env")
 so = env.SConscript("src/SConscript", build_dir="build", duplicate=0)
 env.Install(moduledir, so )
+env.Install(moduledir, ["python/__init__.py"] )
 env.Alias('install',moduledir)

trunk/src/SConscript

@@ -57 +57 @@
 """.split()
 
-# CASA
-casalibs = """
-casav
-atnf images ms components coordinates
-lattices fits measures measures_f
-tables scimath scimath_f casa
-wcs
-rpfits
-""".split()
 
 # OTHER
-genlibs = """
-g2c stdc++ lapack blas
-""".split()
+#genlibs = """
+#g2c stdc++ lapack blas
+#""".split()
 
-myenv.Append( LIBS =  casalibs )
-myenv.Append( LIBS =  ['cfitsio_lfs'] )
-myenv.Append( LIBS =  genlibs )
+#myenv.Append( LIBS =  ['cfitsio_lfs'] )
+#myenv.Append( LIBS =  genlibs )
 
-# Explicit templates in casa
-myenv.Append( CPPFLAGS = ['-DAIPS_NO_TEMPLATE_SRC'] )
 
 casalibd = os.path.join(myenv['CASAROOT'],myenv['CASAARCH'],'lib')