cmake: s/NPM/NPM_EXECUTABLE/

so the naming is more consistent with other executables found by
find_program().

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb269c0e3e8f1067373a561e42f8c6f54b190777..65f7877776446ce933b2e9b52489e921fcb20b2d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -630,8 +630,8 @@ include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS})
 option(WITH_MGR_DASHBOARD_FRONTEND "Build the mgr/dashboard frontend using `npm`" ON)
 option(WITH_SYSTEM_NPM "Assume that dashboard build tools already installed through packages" OFF)
 if(WITH_SYSTEM_NPM)
-  find_program(NPM npm)
-  if(NOT NPM)
+  find_program(NPM_EXECUTABLE npm)
+  if(NOT NPM_EXECUTABLE)
     message(FATAL_ERROR "Can't find npm.")
   endif()
 endif()

diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
index 9928c0e71983166ba4855d5754b61d32cf4654ee..bce59d07dd89b264aac3ce703720be2bfa4c15f3 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
@@ -13,7 +13,7 @@ function(add_npm_command)
   else()
     string(REGEX REPLACE
       "^([^ ]=[^ ] )*npm (.*)$"
-      "\\1${NPM} \\2"
+      "\\1${NPM_EXECUTABLE} \\2"
       command ${command})
   endif()
   string(REPLACE " " ";" command "${command}")