Skip to content

Commit 965a467

Browse files
authored
Switch to a shared xeus for the emscripten build (#657)
* Switch to xeus shared build * Add wasm_kernel.json.in
1 parent 57b5416 commit 965a467

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

CMakeLists.txt

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ if(EMSCRIPTEN)
4444
STRING(REGEX MATCH "python[0-9]+[.][0-9]+" PYTHON_VERSION_STRING ${WASM_PYTHON_LIBRARY})
4545
STRING(REGEX MATCH "[0-9]+" PYTHON_VERSION_MAJOR ${PYTHON_VERSION_STRING})
4646
STRING(REGEX MATCH "[0-9]+$" PYTHON_VERSION_MINOR ${PYTHON_VERSION_STRING})
47+
48+
configure_file (
49+
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/wasm_kernel.json.in"
50+
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json"
51+
)
52+
else()
53+
configure_file (
54+
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json.in"
55+
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json"
56+
)
57+
configure_file (
58+
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json.in"
59+
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json"
60+
)
4761
endif()
4862

49-
configure_file (
50-
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json.in"
51-
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython/kernel.json"
52-
)
53-
configure_file (
54-
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json.in"
55-
"${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xpython-raw/kernel.json"
56-
)
63+
5764

5865
# Build options
5966
# =============
@@ -88,12 +95,12 @@ if(EMSCRIPTEN)
8895
cat(wasm_patches/post.js post.js.in)
8996

9097
add_compile_definitions(XPYT_EMSCRIPTEN_WASM_BUILD)
98+
set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
9199

92100
set(XPYT_BUILD_STATIC OFF)
93101
set(XPYT_BUILD_SHARED OFF)
94102
set(XPYT_BUILD_XPYTHON_EXECUTABLE OFF)
95103
set(XPYT_BUILD_XPYTHON_EXTENSION OFF)
96-
set(XPYT_USE_SHARED_XEUS OFF)
97104
set(XPYT_USE_SHARED_XEUS_PYTHON OFF)
98105
set(XPYT_BUILD_TESTS OFF)
99106
endif()
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"display_name": "Python @PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@ (XPython)",
3+
"argv": [
4+
"@XPYTHON_KERNELSPEC_PATH@xpython"
5+
],
6+
"language": "python",
7+
"metadata": {
8+
"debugger": false,
9+
"shared": {
10+
"libxeus.so": "lib/libxeus.so"
11+
}
12+
}
13+
}

0 commit comments

Comments
 (0)