Skip to content

Make xeus static/shared build user configurable for linking #19

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.

Sign up for GitHub

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

Closed
wants to merge 6 commits into from
Closed

Make xeus static/shared build user configurable for linking #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20312b9
Make xeus static/shared build user configurable for linking
anutosh491 May 30, 2025
7afee43
Update CMakeLists.txt
SylvainCorlay May 31, 2025
15a6e61
Update CMakeLists.txt
SylvainCorlay May 31, 2025
ce7edec
Test with xeus main branch
SylvainCorlay May 31, 2025
2daa288
Link test kernel with xeus
SylvainCorlay May 31, 2025
f68afb0
copy libxeus.so
anutosh491 Jun 2, 2025
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
2 changes: 1 addition & 1 deletion BuildWasmDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN cd /deps/nlohmannjson/build && \
##################################################################

RUN mkdir -p /deps/xeus/build
RUN git clone --branch 5.0.0 https://github.com/jupyter-xeus/xeus.git /deps/xeus/src
RUN git clone --branch main https://github.com/jupyter-xeus/xeus.git /deps/xeus/src

#COPY xeus /deps/xeus/src

Expand Down
17 changes: 12 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ message(STATUS "xeus-lite version: v${XEUS_LITE_VERSION}")

# Build options
# =============
option(XEUS_LITE_USE_SHARED_XEUS "Link with the xeus shared library (instead of the static library)" ON)

# Test options
option(XEUS_LITE_BUILD_NODE_TESTS "xeus-lite test suite (node)" OFF)
Expand All @@ -49,11 +50,16 @@ endif()
# Print build configuration
# ==========================

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

# Dependencies
# ============

if(EMSCRIPTEN AND XEUS_LITE_USE_SHARED_XEUS)
set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
endif()

set(xeus_REQUIRED_VERSION 5.0.0)

if (NOT TARGET xeus)
Expand Down Expand Up @@ -86,10 +92,11 @@ target_include_directories(
PUBLIC $<BUILD_INTERFACE:${XEUS_LITE_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(
xeus-lite
PUBLIC xeus-static
)
if(XEUS_LITE_USE_SHARED_XEUS)
target_link_libraries(xeus-lite PUBLIC xeus)
else()
target_link_libraries(xeus-lite PUBLIC xeus-static)
endif()

set_target_properties(
xeus-lite
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if(XEUS_LITE_BUILD_BROWSER_TEST_KERNEL)

SET(KERNEL_INSTALL_DIR "share/jupyter/kernels/xlite")

install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/logo-64x64.png"
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/logo-64x64.png"
"${CMAKE_CURRENT_SOURCE_DIR}/logo-32x32.png"
"$<TARGET_FILE_DIR:xlite>/xlite.wasm"
"$<TARGET_FILE_DIR:xlite>/xlite.js"
Expand Down
1 change: 1 addition & 0 deletions test/copy_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
set -e
cd /xeus-build/test
cp *.{js,wasm} /xeus-lite/test
cp /install/lib/libxeus.so /xeus-lite/test
Loading