Skip to content

Commit

Permalink
Solve bugs from espree cmake.
Browse files Browse the repository at this point in the history
  • Loading branch information
viferga committed Sep 13, 2022
1 parent 8d5d674 commit 2fe00d2
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions source/loaders/node_loader/bootstrap/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ if(NOT OPTION_BUILD_GUIX)
COMMAND ${NPM_EXECUTABLE} --prefix ${CMAKE_CURRENT_BINARY_DIR} install ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_OUTPUT_DIR}/node_modules
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/espree ${PROJECT_OUTPUT_DIR}/node_modules/espree
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/acorn ${PROJECT_OUTPUT_DIR}/node_modules/acorn
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/acorn-jsx ${PROJECT_OUTPUT_DIR}/node_modules/acorn-jsx
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/node_modules/eslint-visitor-keys ${PROJECT_OUTPUT_DIR}/node_modules/eslint-visitor-keys
COMMAND ${CMAKE_COMMAND} -E echo "${target} dependencies copied from ${CMAKE_CURRENT_BINARY_DIR}/node_modules to ${PROJECT_OUTPUT_DIR}/node_modules"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/package.json ${CMAKE_CURRENT_SOURCE_DIR}/lib/package-lock.json
)
Expand All @@ -67,13 +70,19 @@ if(NOT OPTION_BUILD_GUIX)

install(DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/node_modules/espree
${CMAKE_CURRENT_BINARY_DIR}/node_modules/acorn
${CMAKE_CURRENT_BINARY_DIR}/node_modules/acorn-jsx
${CMAKE_CURRENT_BINARY_DIR}/node_modules/eslint-visitor-keys
DESTINATION ${INSTALL_LIB}/node_modules
COMPONENT runtime
)
else()
# Guix stores espree dependency previously to the build in the output directory
install(DIRECTORY
${PROJECT_OUTPUT_DIR}/node_modules/espree
${PROJECT_OUTPUT_DIR}/node_modules/acorn
${PROJECT_OUTPUT_DIR}/node_modules/acorn-jsx
${PROJECT_OUTPUT_DIR}/node_modules/eslint-visitor-keys
DESTINATION ${INSTALL_LIB}/node_modules
COMPONENT runtime
)
Expand Down

0 comments on commit 2fe00d2

Please sign in to comment.