cmake: use ${NPM} instead of npm

so it is more explicit that ${NPM} is used when NODEENV is not
specified.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
index 3d9995b7c5d4b8335c69a9df309f871d5bf2dc7a..9928c0e71983166ba4855d5754b61d32cf4654ee 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
@@ -6,7 +6,15 @@ function(add_npm_command)
   cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
   string(REPLACE ";" " " command "${NC_COMMAND}")
   if(NC_NODEENV)
-    string(REGEX REPLACE "^(.*npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
+    string(REGEX REPLACE
+      "^(([^ ]+=[^ ]+ )*npm .*)$"
+      ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate"
+      command ${command})
+  else()
+    string(REGEX REPLACE
+      "^([^ ]=[^ ] )*npm (.*)$"
+      "\\1${NPM} \\2"
+      command ${command})
   endif()
   string(REPLACE " " ";" command "${command}")
   add_custom_command(