all: honor path_list kw-arg, propagate to find_xyz

Author: sbinet

find_clhep.py

@@ -38,7 +38,7 @@ def find_clhep(ctx, **kwargs):
 
     # find CLHEP
     clhep_cfg = "clhep-config"
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_clhep', None):
         topdir = ctx.options.with_clhep
         topdir = ctx.hwaf_subst_vars(topdir)

find_cmake.py

@@ -39,17 +39,17 @@ def find_cmake(ctx, **kwargs):
         pass
 
 
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_cmake', None):
         topdir = ctx.options.with_cmake
         topdir = ctx.hwaf_subst_vars(topdir)
         path_list.append(osp.join(topdir, "bin"))
         pass
-
+    kwargs['path_list'] = path_list
+    
     ctx.find_program(
         "cmake",
         var="CMAKE",
-        path_list=path_list,
         **kwargs)
 
     kwargs['mandatory'] = False

find_compiler.py

@@ -63,7 +63,7 @@ def find_c_compiler(ctx, **kwargs):
         pass
 
     # find CC
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_hwaf_toolchain', None):
         topdir = ctx.options.with_hwaf_toolchain
         topdir = ctx.hwaf_subst_vars(topdir)
@@ -130,7 +130,7 @@ def find_cxx_compiler(ctx, **kwargs):
         pass
 
     # find CXX
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_hwaf_toolchain', None):
         topdir = ctx.options.with_hwaf_toolchain
         topdir = ctx.hwaf_subst_vars(topdir)
@@ -197,7 +197,7 @@ def find_fortran_compiler(ctx, **kwargs):
         pass
 
     # find FC
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_hwaf_toolchain', None):
         topdir = ctx.options.with_hwaf_toolchain
         topdir = ctx.hwaf_subst_vars(topdir)
@@ -271,13 +271,17 @@ def find_toolchain(ctx, **kw):
         pass
 
     # C compiler
-    ctx.find_c_compiler(**kw)
+    c_kw = dict(kw)
+    ctx.find_c_compiler(**c_kw)
 
     # C++ compiler
-    ctx.find_cxx_compiler(**kw)
+    cxx_kw = dict(kw)
+    ctx.find_cxx_compiler(**cxx_kw)
 
     # Fortran compiler
-    ctx.find_fortran_compiler(mandatory=False, **kw)
+    fc_kw = dict(kw)
+    fc_kw['mandatory'] = fc_kw.get('mandatory', False)
+    ctx.find_fortran_compiler(**fc_kw)
 
     ctx.env.HWAF_FOUND_TOOLCHAIN = 1
     return

find_gccxml.py

@@ -40,7 +40,7 @@ def find_gccxml(ctx, **kwargs):
 
     # find gccxml
     gccxml_bin = "gccxml"
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_gccxml', None):
         topdir = ctx.options.with_gccxml
         topdir = ctx.hwaf_subst_vars(topdir)

find_libxml2.py

@@ -38,18 +38,17 @@ def find_libxml2(ctx, **kwargs):
 
     # find LibXML2
     xml_cfg = "xml2-config"
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_libxml2', None):
         topdir = ctx.options.with_libxml2
         topdir = ctx.hwaf_subst_vars(topdir)
         path_list.append(osp.abspath(osp.join(topdir, "bin")))
         pass
-
+    kwargs['path_list'] = path_list
 
     ctx.find_program(
         xml_cfg,
         var='LIBXML2-CONFIG',
-        path_list=path_list,
         **kwargs)
     #xml_cfg = ctx.env['LIBXML2-CONFIG']
 

find_python.py

@@ -79,7 +79,7 @@ def find_python(ctx, **kwargs):
     pyversion = kwargs.get("version", (2,6))
 
     # find python
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_python', None):
         topdir = ctx.options.with_python
         topdir = ctx.hwaf_subst_vars(topdir)

find_root.py

@@ -62,7 +62,7 @@ def find_root(ctx, **kwargs):
 
     # find root
     root_cfg = "root-config"
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_root', None):
         topdir = ctx.options.with_root
         topdir = ctx.hwaf_subst_vars(topdir)

find_sqlite.py

@@ -37,7 +37,7 @@ def find_sqlite(ctx, **kwargs):
         ctx.fatal('load a C++ compiler first')
         pass
 
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_sqlite', None):
         topdir = ctx.options.with_sqlite
         topdir = ctx.hwaf_subst_vars(topdir)

find_tcmalloc.py

@@ -37,7 +37,7 @@ def find_tcmalloc(ctx, **kwargs):
         ctx.fatal('load a C++ compiler first')
         pass
 
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_tcmalloc', None):
         path_list.append(
             osp.join(ctx.options.with_tcmalloc, "bin")

find_valgrind.py

@@ -37,7 +37,7 @@ def find_valgrind(ctx, **kwargs):
         ctx.fatal('load a C++ compiler first')
         pass
 
-    path_list = []
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
     if getattr(ctx.options, 'with_valgrind', None):
         topdir = ctx.options.with_valgrind
         topdir = ctx.hwaf_subst_vars(topdir)

find_xrootd.py

@@ -49,6 +49,10 @@ def find_xrootd(ctx, **kwargs):
     libdir = osp.join(ctx.env.XROOTD_HOME, 'lib')
     incdir = osp.join(ctx.env.XROOTD_HOME, 'include')
 
+    path_list = waflib.Utils.to_list(kwargs.get('path_list', []))
+    path_list.append(bindir)
+    kwargs['path_list'] = path_list
+    
     ctx.define_uselib(
         name="xrootd-posix", 
         libpath=libdir,
@@ -76,14 +80,12 @@ def find_xrootd(ctx, **kwargs):
     ctx.find_program(
         "xrdcp", 
         var="XRDCP-BIN", 
-        path_list=bindir,
         **kwargs)
 
     kwargs['mandatory'] = False
     ctx.find_program(
         "xrootd", 
         var="XROOTD-BIN", 
-        path_list=bindir,
         **kwargs)
 
     # -- check everything is kosher...