Skip to content

Make XEUS_CPP_RESOURCE_DIR a user configurable option #312

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

Merged
merged 4 commits into from
May 27, 2025
Merged

Make XEUS_CPP_RESOURCE_DIR a user configurable option #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a4ce81
Make LLVM_RESOURCE_DIR an option that can be provided by the user
mcbarton May 25, 2025
721260e
Update CMakeLists.txt
mcbarton May 25, 2025
5a7d6c8
Change to clang resource dir instead of llvm resource dir
mcbarton May 26, 2025
765e90d
Use xeus-cpp-resource-dir instead
anutosh491 May 26, 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
11 changes: 7 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,18 @@ find_package(pugixml REQUIRED)
# Configuration
# =============

if(NOT DEFINED XEUS_CPP_RESOURCE_DIR)
set(XEUS_CPP_RESOURCE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}")
message(STATUS "Using clang resource dir headers from ${XEUS_CPP_RESOURCE_DIR}")
endif()

if (NOT DEFINED XEUS_CPP_KERNELSPEC_PATH)
set(XEUS_CPP_KERNELSPEC_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/")
endif ()

function(configure_native_kernel kernel)
set(XEUS_CPP_PATH "$ENV{PATH}")
set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
set(XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR})
set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)

if (WIN32)
Expand Down Expand Up @@ -169,7 +173,6 @@ endfunction()

message("Configure kernels: ...")
if(EMSCRIPTEN)
set(XEUS_CPP_RESOURCE_DIR "/lib/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}")
configure_wasm_kernel("/share/jupyter/kernels/xcpp17/")
configure_wasm_kernel("/share/jupyter/kernels/xcpp20/")
configure_wasm_kernel("/share/jupyter/kernels/xcpp23/")
Expand Down Expand Up @@ -438,7 +441,7 @@ if(EMSCRIPTEN)
target_link_options(xcpp
PUBLIC "SHELL: -s USE_SDL=2"
PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
PUBLIC "SHELL: --preload-file ${CMAKE_INSTALL_PREFIX}${XEUS_CPP_RESOURCE_DIR}@${XEUS_CPP_RESOURCE_DIR}"
PUBLIC "SHELL: --preload-file ${XEUS_CPP_RESOURCE_DIR}@/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}"
PUBLIC "SHELL: --preload-file ${XEUS_CPP_DATA_DIR}@/share/xeus-cpp"
PUBLIC "SHELL: --preload-file ${XEUS_CPP_CONF_DIR}@/etc/xeus-cpp"
PUBLIC "SHELL: --post-js ${CMAKE_CURRENT_SOURCE_DIR}/wasm_patches/post.js"
Expand Down Expand Up @@ -535,4 +538,4 @@ if(EMSCRIPTEN)
"$<TARGET_FILE_DIR:xcpp>/xcpp.wasm"
"$<TARGET_FILE_DIR:xcpp>/xcpp.data"
DESTINATION ${CMAKE_INSTALL_BINDIR})
endif ()
endif ()
2 changes: 1 addition & 1 deletion share/jupyter/kernels/xcpp17/wasm_kernel.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"display_name": "C++17",
"argv": [
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
"-std=c++17"
],
"language": "cpp",
Expand Down
2 changes: 1 addition & 1 deletion share/jupyter/kernels/xcpp20/wasm_kernel.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"display_name": "C++20",
"argv": [
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
"-std=c++20"
],
"language": "cpp",
Expand Down
2 changes: 1 addition & 1 deletion share/jupyter/kernels/xcpp23/wasm_kernel.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"display_name": "C++23",
"argv": [
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
"-std=c++23"
],
"language": "cpp",
Expand Down
Loading