Changeset 1406

Timestamp:

01/31/08 15:03:34 (17 years ago)

Author:

Malte Marquarding

Message:

work with the latest version of casacore; made release mode default. Add optional build of apps.

File:

• trunk/SConstruct (modified) (4 diffs)

trunk/SConstruct

@@ -53 +53 @@
                 ("rpfitslibdir", "The rpfits library location", None),
 #               ("rpfitsincdir", "The rpfits include location", None),
-                EnumOption("mode", "The type of build.", "debug",
+                EnumOption("mode", "The type of build.", "release",
                            ["release","debug"], ignorecase=1),
                 ("makedist",
@@ -60 +60 @@
                 EnumOption("makedoc", "Build the userguide in specified format",
                            "none",
-                           ["none", "pdf", "html"], ignorecase=1)
+                           ["none", "pdf", "html"], ignorecase=1),
+                BoolOption("apps", "Build cpp apps", False)
                 )
 
@@ -83 +84 @@
 
 # load casacore specific build flags
+env.Tool('casaoptions', [casacoretooldir])
+env.AddCommonOptions(opts)
+opts.Update(env)
 env.Tool('casa', [casacoretooldir])
 
@@ -209 +213 @@
     env.SConscript("doc/SConscript")
 
+if env["apps"]:
+    env.SConscript("apps/SConscript")
+
 if env.GetOption("clean"):
     Execute(Delete(".sconf_temp"))