Skip to content

Commit a21416e

Browse files
committed
Copy package-lock.json to install directory for the new web GUI.
1 parent b146272 commit a21416e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

webgui-new/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ install(FILES
1313

1414
# Install React application
1515
install(CODE "set(CC_PACKAGE \"${CMAKE_CURRENT_SOURCE_DIR}/package.json\")")
16+
install(CODE "set(CC_PACKAGE_LOCK \"${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json\")")
1617
install(CODE "set(INSTALL_WEBROOT_DIR ${INSTALL_WEBROOT_DIR})")
1718
install(CODE "set(INSTALL_WEBROOT_REACT_DIR ${INSTALL_WEBROOT_REACT_DIR})")
1819
install(CODE "set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE})")

webgui-new/InstallReact.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ include(${CMAKE_SOURCE_DIR}/Functions.cmake)
33

44
message("Install npm packages...")
55

6-
if(${CC_PACKAGE} IS_NEWER_THAN ${INSTALL_WEBROOT_REACT_DIR}/app/package.json)
6+
if(${CC_PACKAGE_LOCK} IS_NEWER_THAN ${INSTALL_WEBROOT_REACT_DIR}/app/package-lock.json)
77
execute_process(
88
COMMAND ${CMAKE_COMMAND} -E copy ${CC_PACKAGE} ${INSTALL_WEBROOT_REACT_DIR}/app/package.json
9+
COMMAND ${CMAKE_COMMAND} -E copy ${CC_PACKAGE_LOCK} ${INSTALL_WEBROOT_REACT_DIR}/app/package-lock.json
910
WORKING_DIRECTORY ${INSTALL_WEBROOT_REACT_DIR})
1011

1112
execute_process(

0 commit comments

Comments
 (0)