Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unify-wasm-kernels #9

Merged
merged 7 commits into from
Nov 29, 2023
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
3 changes: 2 additions & 1 deletion BuildWasmDockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ RUN mkdir -p /xeus-build && cd /xeus-build && \
-Dnlohmann_json_DIR=/install/lib/cmake/nlohmann_json \
-Dxtl_DIR=/install/share/cmake/xtl \
-Dxeus_DIR=/install/lib/cmake/xeus \
-DXEUS_LITE_BUILD_TESTS=ON
-DXEUS_LITE_BUILD_BROWSER_TEST_KERNEL=ON \
-DXEUS_LITE_BUILD_NODE_TESTS=ON

RUN cd /xeus-build && \
emmake make -j8
Expand Down
23 changes: 5 additions & 18 deletions CMakeLists.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you delete the ts files, you can also remove the line

set(XEUS_LITE_TS_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}" CACHE STRING "install path for typescript files")

from this CMakeLists.txt.

(I did not find how to comment on a line that is not in the diff).

Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,21 @@ message(STATUS "xeus-lite version: v${XEUS_LITE_VERSION}")
# =============

# Test options
option(XEUS_LITE_BUILD_TESTS "xeus test suite" OFF)

option(XEUS_LITE_BUILD_NODE_TESTS "xeus-lite test suite (node)" OFF)
option(XEUS_LITE_BUILD_BROWSER_TEST_KERNEL "xeus-lte test kernel (browser)" OFF)
# Emscripten wasm build configuration
# ==========================

# Tests are run in Node, while production builds in the browser.
if(XEUS_LITE_BUILD_TESTS)
if(XEUS_LITE_BUILD_NODE_TESTS)
# this variable is used in the export_core function
add_compile_definitions(XEUS_LITE_EMSCRIPTEN_WASM_TEST_BUILD)
endif()

# Print build configuration
# ==========================

message(STATUS "XEUS_LITE_BUILD_TESTS: ${XEUS_LITE_BUILD_TESTS}")
message(STATUS "XEUS_LITE_BUILD_NODE_TESTS: ${XEUS_LITE_BUILD_NODE_TESTS}")

# Dependencies
# ============
Expand Down Expand Up @@ -122,15 +122,7 @@ xeus_wasm_compile_options(xeus-lite)

include(CTest)

if(XEUS_LITE_BUILD_TESTS)
set(BUILD_TESTING ON)
message(STATUS "tests enabled")
else ()
set(BUILD_TESTING OFF)
message(STATUS "tests disabled")
endif()

if(BUILD_TESTING)
if(XEUS_LITE_BUILD_NODE_TESTS OR XEUS_LITE_BUILD_BROWSER_TEST_KERNEL)
add_subdirectory(test)
endif()

Expand All @@ -142,8 +134,6 @@ include(CMakePackageConfigHelpers)

set(XEUS_LITE_CMAKECONFIG_INSTALL_DIR
"${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE STRING "install path for xeus-liteConfig.cmake")
set(XEUS_LITE_TS_INSTALL_DIR
"${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}" CACHE STRING "install path for typescript files")

install(TARGETS xeus-lite
EXPORT ${PROJECT_NAME}-targets
Expand Down Expand Up @@ -181,6 +171,3 @@ install(EXPORT ${PROJECT_NAME}-targets
FILE ${PROJECT_NAME}Targets.cmake
DESTINATION ${XEUS_LITE_CMAKECONFIG_INSTALL_DIR})

install(DIRECTORY share/${PROJECT_NAME}/
DESTINATION ${XEUS_LITE_TS_INSTALL_DIR})

206 changes: 0 additions & 206 deletions share/xeus-lite/web_worker_kernel.ts

This file was deleted.

Loading