Skip to content

Commit 2fe00d2

Browse files
committed
Solve bugs from espree cmake.
1 parent 8d5d674 commit 2fe00d2

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

source/loaders/node_loader/bootstrap/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ if(NOT OPTION_BUILD_GUIX)
5353
COMMAND ${NPM_EXECUTABLE} --prefix ${CMAKE_CURRENT_BINARY_DIR} install ${CMAKE_CURRENT_BINARY_DIR}
5454
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_OUTPUT_DIR}/node_modules
5555
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/espree ${PROJECT_OUTPUT_DIR}/node_modules/espree
56+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/acorn ${PROJECT_OUTPUT_DIR}/node_modules/acorn
57+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/acorn-jsx ${PROJECT_OUTPUT_DIR}/node_modules/acorn-jsx
58+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/eslint-visitor-keys ${PROJECT_OUTPUT_DIR}/node_modules/eslint-visitor-keys
5659
COMMAND ${CMAKE_COMMAND} -E echo "${target} dependencies copied from ${CMAKE_CURRENT_BINARY_DIR}/node_modules to ${PROJECT_OUTPUT_DIR}/node_modules"
5760
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/package.json ${CMAKE_CURRENT_SOURCE_DIR}/lib/package-lock.json
5861
)
@@ -67,13 +70,19 @@ if(NOT OPTION_BUILD_GUIX)
6770

6871
install(DIRECTORY
6972
${CMAKE_CURRENT_BINARY_DIR}/node_modules/espree
73+
${CMAKE_CURRENT_BINARY_DIR}/node_modules/acorn
74+
${CMAKE_CURRENT_BINARY_DIR}/node_modules/acorn-jsx
75+
${CMAKE_CURRENT_BINARY_DIR}/node_modules/eslint-visitor-keys
7076
DESTINATION ${INSTALL_LIB}/node_modules
7177
COMPONENT runtime
7278
)
7379
else()
7480
# Guix stores espree dependency previously to the build in the output directory
7581
install(DIRECTORY
7682
${PROJECT_OUTPUT_DIR}/node_modules/espree
83+
${PROJECT_OUTPUT_DIR}/node_modules/acorn
84+
${PROJECT_OUTPUT_DIR}/node_modules/acorn-jsx
85+
${PROJECT_OUTPUT_DIR}/node_modules/eslint-visitor-keys
7786
DESTINATION ${INSTALL_LIB}/node_modules
7887
COMPONENT runtime
7988
)

0 commit comments

Comments
 (0)