Update wcb script to build eval_dlee

BNLIF · Sep 14, 2021 · 2425dd2 · 2425dd2
1 parent f560761
commit 2425dd2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/apps/eval_dlee.cxx b/apps/eval_dlee.cxx
@@ -1,5 +1,5 @@
 #include "config.h"
-#if HAVE_VLNEVAL == 1
+#if (HAVE_VLNEVAL_INC == 1) && (HAVE_VLNEVAL_LIB == 1)
 
 #include <iostream>
 #include <unordered_map>

diff --git a/wcb b/wcb
diff --git a/wscript b/wscript
@@ -8,9 +8,11 @@ def options(opt):
     opt.load("wcb")
 
 def configure(cfg):
-
     cfg.load("wcb")
 
+    if cfg.env["HAVE_VLNEVAL"]:
+        cfg.check_boost(lib = 'program_options')
+
     # boost 1.59 uses auto_ptr and GCC 5 deprecates it vociferously.
     cfg.env.CXXFLAGS += ['-Wno-deprecated-declarations']
     cfg.env.CXXFLAGS += ['-Wall', '-Wno-unused-local-typedefs', '-Wno-unused-function']
@@ -19,4 +21,11 @@ def configure(cfg):
 
 def build(bld):
     bld.load('wcb')
-    bld.smplpkg('WCPuBooNE_BDT_APP', use='ROOTSYS')
+
+    use = [ 'ROOTSYS' ]
+
+    if bld.env["HAVE_VLNEVAL"]:
+        use += [ 'VLNEVAL', 'BOOST' ]
+
+    bld.smplpkg('WCPuBooNE_BDT_APP', use = use)
+