Merge pull request #3283 from ggouaillardet/topic/nvml

build nvml support only with CUDA support

opal/mca/hwloc/hwloc1116/configure.m4

@@ -111,10 +111,17 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1116_CONFIG],[
     enable_libxml2=no
     enable_xml=yes
 
+    # Disable NVML support if CUDA support is not built
+    AS_IF([test "$opal_check_cuda_happy" != "yes"],
+          [enable_nvml=no])
+
     # hwloc checks for compiler visibility, and its needs to do
     # this without "picky" flags.
     opal_hwloc_hwloc1116_save_cflags=$CFLAGS
     CFLAGS=$OPAL_CFLAGS_BEFORE_PICKY
+    AS_IF([test -n "$opal_datatype_cuda_CPPFLAGS"],
+          [CPPFLAGS="$CPPFLAGS $opal_datatype_cuda_CPPFLAGS"])
+
     HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1116/hwloc],
               [AC_MSG_CHECKING([whether hwloc configure succeeded])
                AC_MSG_RESULT([yes])