From f8faaceec77054ca4876fa99d749c22ccc54aeea Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Fri, 17 Nov 2023 09:06:11 +0100
Subject: [PATCH] split command
---
CMake/NPMInstall.cmake | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMake/NPMInstall.cmake b/CMake/NPMInstall.cmake
index bedfc0148eb..d7168513f82 100644
--- a/CMake/NPMInstall.cmake
+++ b/CMake/NPMInstall.cmake
@@ -114,14 +114,17 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
OUTPUT "${NPM_BINARY_DIR}/package.json"
OUTPUT "${NPM_BINARY_DIR}/package-lock.json"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${JSON_PACKAGE_SPECIFICATION}" "${NPM_BINARY_DIR}/package.json"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${JSON_PACKAGE_LOCK_SPECIFICATION}" "${NPM_BINARY_DIR}/package-lock.json"
DEPENDS
- ${JSON_PACKAGE_SPECIFICATION}
${JSON_PACKAGE_LOCK_SPECIFICATION}
COMMENT "Copying ${JSON_PACKAGE_SPECIFICATION} to ${NPM_BINARY_DIR}/package.json for ${PACKAGE_NAME}")
-
+ add_custom_command(
+ OUTPUT "${NPM_BINARY_DIR}/package-lock.json"
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different "${JSON_PACKAGE_LOCK_SPECIFICATION}" "${NPM_BINARY_DIR}/package-lock.json"
+ DEPENDS
+ ${JSON_PACKAGE_LOCK_SPECIFICATION}
+ COMMENT "Copying ${JSON_PACKAGE_SPECIFICATION} to ${NPM_BINARY_DIR}/package.json for ${PACKAGE_NAME}")
foreach(file ${SOURCE_FILES})
add_custom_command(OUTPUT "${NPM_BINARY_DIR}/src/${file}"
@@ -170,9 +173,7 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
add_custom_command(
OUTPUT "${NPM_BINARY_DIR}/node_modules"
- COMMAND ${CMAKE_COMMAND} -E echo "Starting NPM CI"
COMMAND NODE_OPTIONS="--max-old-space-size=8192" npm ci
- COMMAND ${CMAKE_COMMAND} -E echo "Completed NPM CI"
DEPENDS "${NPM_BINARY_DIR}/package.json" "${NPM_BINARY_DIR}/package-lock.json"
WORKING_DIRECTORY "${NPM_BINARY_DIR}"
COMMENT "Downloading npm dependencies for ${NPM_BINARY_DIR}/package.json with the help of the lock file")
--
GitLab