From 02f2cc5a05292f16ced26d2577c5479e9528ba78 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Sun, 17 Sep 2023 20:54:59 +0200 Subject: [PATCH] Node v14 required for lv_font_conv (#122) * Update miminum node version to v14+ as lv_font_conv minimum The current readme of the `lv_font_conv` the minimum node.js version is v14+. Update our readme to mention that minimum version as well. https://github.com/lvgl/lv_font_conv#install-the-script --- In Check node version and issue a warning if less than v14.0.0. Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/109 --- CMakeLists.txt | 14 ++++++++++++++ README.md | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc54529..11fa311 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -268,6 +268,20 @@ set_target_properties(QCBOR PROPERTIES LINKER_LANGUAGE C) # ) target_link_libraries(infinisim PRIVATE QCBOR) +# check version number of installed node package for minimum required +find_program(NODE_EXE "node" NO_CACHE QUIET) +if(NODE_EXE) + exec_program("${NODE_EXE}" ARGS "--version" OUTPUT_VARIABLE NODE_VERSION) + string(REPLACE "v" "" NODE_VERSION "${NODE_VERSION}") + if(NODE_VERSION VERSION_LESS 14.0.0) + message(WARNING "Node version v${NODE_VERSION} is less than required 14+, you will probably encounter build errors") + else() + message(STATUS "Founde node version v${NODE_VERSION}") + endif() +else() + message(STATUS "Didn't find executable 'node' in path to check its version number") +endif() + if(EXISTS ${InfiniTime_DIR}/src/displayapp/fonts/CMakeLists.txt) # available since https://github.com/InfiniTimeOrg/InfiniTime/pull/1097 message(STATUS "add subdirectory ${InfiniTime_DIR}/src/displayapp/fonts for 'infinitime_fonts' target") diff --git a/README.md b/README.md index 4b59610..626cdb1 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ git submodule update --init --recursive - SDL2 (provides the simulator window, handles mouse and keyboard input) - Compiler (g++ or clang++) - [lv_font_conv](https://github.com/lvgl/lv_font_conv#install-the-script) (for `font.c` generation since [InfiniTime#1097](https://github.com/InfiniTimeOrg/InfiniTime/pull/1097)) - - Note: requires Node.js v12.0.0 or later + - Note: requires Node.js v14.0.0 or later - [lv_img_conv](https://github.com/lvgl/lv_img_conv) (for `resource.zip` generation when `BUILD_RESOURCES=ON`, which is the default) - optional: `libpng`, see `-DWITH_PNG=ON` cmake setting below for more info