hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1300: Add check for Node.js version

Browse Source 
The Node.js version is checked before MaxCtrl is built.
This commit is contained in:
Markus Mäkelä
2017-07-24 10:56:10 +03:00
parent 81327dffca
commit 4bb4b921cb
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmake/FindNodeJS.cmake Normal file
View File

@ -0,0 +1,22 @@
# Find the Node.js executable
#
# The following variables are set:
# NODEJS_FOUND True if Node.js was found
# NODEJS_EXECUTABLE Path to the Node.js executable
# NODEJS_VERSION Node.js version
find_program(NODEJS_EXECUTABLE node)
if (${NODEJS_EXECUTABLE} MATCHES "NOTFOUND")
message(STATUS "Could not find Node.js")
set(NODEJS_FOUND FALSE CACHE INTERNAL "")
unset(NODEJS_EXECUTABLE)
else()
execute_process(COMMAND ${NODEJS_EXECUTABLE} --version
OUTPUT_VARIABLE VERSION_VAR)
string(REGEX REPLACE "[v]" "" VERSION_VAR ${VERSION_VAR})
string(STRIP ${VERSION_VAR} VERSION_VAR)
set(NODEJS_VERSION ${VERSION_VAR} CACHE INTERNAL "")
set(NODEJS_FOUND TRUE CACHE INTERNAL "")
message(STATUS "Found Node.js version ${NODEJS_VERSION}: ${NODEJS_EXECUTABLE}")
endif()

5
maxctrl/CMakeLists.txt
View File

@ -1,6 +1,7 @@
find_package(NPM)
find_package(NodeJS)
if (NPM_FOUND)
if (NPM_FOUND AND NODEJS_FOUND AND NODEJS_VERSION VERSION_GREATER "6.0.0")
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/maxctrl/maxctrl
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.sh ${CMAKE_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
@ -15,5 +16,5 @@ if (NPM_FOUND)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
else()
message(STATUS "Not building MaxCtrl: npm not found")
message(STATUS "Not building MaxCtrl: npm or Node.js >= 6.0.0 not found")
endif()