Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions quickjs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ set(NAPI_QUICKJS_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
# include("${NAPI_V8_ROOT}/cmake/NapiEngine.cmake")
# include("${NAPI_V8_ROOT}/cmake/NapiV8Resolver.cmake")
# napi_engine_set_layout("${NAPI_V8_ROOT}")
# set(NAPI_V8_NODE_ROOT_DEFAULT "${PROJECT_ROOT}/node")
# if(DEFINED ENV{NAPI_V8_NODE_ROOT})
# set(NAPI_V8_NODE_ROOT_DEFAULT "$ENV{NAPI_V8_NODE_ROOT}")
# endif()
# set(NAPI_V8_NODE_ROOT
# "${NAPI_V8_NODE_ROOT_DEFAULT}"
# CACHE PATH "Path to Node source root (for raw Node tests/fixtures)"
# )
# napi_v8_resolve_configuration()

include("${NAPI_QUICKJS_ROOT}/cmake/NapiEngine.cmake")
Expand Down
2 changes: 1 addition & 1 deletion quickjs/deps/quickjs
Submodule quickjs updated 1 files
+308 −241 quickjs.c
2 changes: 1 addition & 1 deletion quickjs/src/internal/napi_contextify.cc
Original file line number Diff line number Diff line change
Expand Up @@ -817,9 +817,9 @@ namespace quickjs::detail
napi_env_context_scope__ child_scope{env_, record->ctx};
JSEvalOptions options{
.version = JS_EVAL_OPTIONS_VERSION,
.eval_flags = JS_EVAL_TYPE_GLOBAL,
.filename = label.c_str(),
.line_num = std::max<int32_t>(1, line_offset + 1),
.eval_flags = JS_EVAL_TYPE_GLOBAL,
};
result = JS_EvalThis2(record->ctx, record->global, src.c_str(), src.size(), &options);
if (JS_IsException(result))
Expand Down
8 changes: 0 additions & 8 deletions v8/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ napi_enable_sccache_if_available()
include("${NAPI_V8_ROOT}/cmake/NapiEngine.cmake")
include("${NAPI_V8_ROOT}/cmake/NapiV8Resolver.cmake")
napi_engine_set_layout("${NAPI_V8_ROOT}")
set(NAPI_V8_NODE_ROOT_DEFAULT "${PROJECT_ROOT}/node")
if(DEFINED ENV{NAPI_V8_NODE_ROOT})
set(NAPI_V8_NODE_ROOT_DEFAULT "$ENV{NAPI_V8_NODE_ROOT}")
endif()
set(NAPI_V8_NODE_ROOT
"${NAPI_V8_NODE_ROOT_DEFAULT}"
CACHE PATH "Path to Node source root (for raw Node tests/fixtures)"
)
napi_v8_resolve_configuration()

file(GLOB_RECURSE NAPI_V8_SRC_FILES
Expand Down
Loading