Repository: qpid-dispatch Updated Branches: refs/heads/master 0310ac224 -> 9dcf20ca0
DISPATCH-1017 Checking for existence of npx before building console Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/9dcf20ca Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/9dcf20ca Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/9dcf20ca Branch: refs/heads/master Commit: 9dcf20ca05a45dee992096b41dafe0bbe052b8b7 Parents: 0310ac2 Author: Ernest Allen <[email protected]> Authored: Tue Jun 5 12:48:35 2018 -0400 Committer: Ernest Allen <[email protected]> Committed: Tue Jun 5 12:48:35 2018 -0400 ---------------------------------------------------------------------- console/CMakeLists.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9dcf20ca/console/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt index 38b2de3..83cf83a 100644 --- a/console/CMakeLists.txt +++ b/console/CMakeLists.txt @@ -23,8 +23,8 @@ option(CONSOLE_INSTALL "Build and install console (requires npm)" ON) if(CONSOLE_INSTALL) - find_program(NPM_EXE npm DOC "Location of the npm package manager") - if (NPM_EXE) + find_program(NPX_EXE npx DOC "Location of the npx task runner") + if (NPEX_EXE) set(CONSOLE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/console/stand-alone") set(CONSOLE_BUILD_DIR "${CMAKE_BINARY_DIR}/console") @@ -56,7 +56,7 @@ if(CONSOLE_INSTALL) OUTPUT ${CONSOLE_ARTIFACTS} COMMENT "Running console build" COMMAND npm install --loglevel=error - COMMAND npx gulp --src ${CONSOLE_SOURCE_DIR} + COMMAND ${NPX_EXE} gulp --src ${CONSOLE_SOURCE_DIR} DEPENDS ${ALL_CONSOLE_SOURCES} WORKING_DIRECTORY ${CONSOLE_BUILD_DIR}/ ) @@ -112,10 +112,9 @@ if(CONSOLE_INSTALL) install(FILES ${VENDOR_FONTS} DESTINATION ${CONSOLE_STAND_ALONE_INSTALL_DIR}/fonts/ ) - - else(NPM_EXE) - message(WARNING "Cannot build console, npm not found") - endif(NPM_EXE) + else(NPX_EXE) + message(STATUS "Cannot build console, npm not found") + endif(NPX_EXE) endif(CONSOLE_INSTALL) ## --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
