Skip to content

Combine configure_native_kernel and configure_wasm_kernel functions into configure_kernel function #359

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Combine configure_native_kernel and configure_wasm_kernel functions into configure_kernel function #359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 37 additions & 46 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,66 +120,57 @@ 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_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)

if (WIN32)
string(REPLACE "\\" "/" kernel "${kernel}")
string(REPLACE "\\" "/" XEUS_CPP_PATH "${XEUS_CPP_PATH}")
string(REPLACE "\\" "/" XEUS_CPP_LD_LIBRARY_PATH "${XEUS_CPP_LD_LIBRARY_PATH}")
string(REPLACE "\\" "/" XEUS_CPP_RESOURCE_DIR "${XEUS_CPP_RESOURCE_DIR}")
string(REPLACE "\\" "/" XEUS_CPP_INCLUDE_DIR "${XEUS_CPP_INCLUDE_DIR}")
endif()

configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}kernel.json.in"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}kernel.json")
function(configure_kernel kernel is_wasm)
if(NOT is_wasm)
set(XEUS_CPP_PATH "$ENV{PATH}")
set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)

configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}logo-32x32.png"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}"
COPYONLY)
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}logo-64x64.png"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}"
COPYONLY)
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}logo-svg.svg"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}"
COPYONLY)
endfunction()

function(configure_wasm_kernel kernel)
if (WIN32)
string(REPLACE "\\" "/" kernel "${kernel}")
string(REPLACE "\\" "/" XEUS_CPP_PATH "${XEUS_CPP_PATH}")
string(REPLACE "\\" "/" XEUS_CPP_LD_LIBRARY_PATH "${XEUS_CPP_LD_LIBRARY_PATH}")
string(REPLACE "\\" "/" XEUS_CPP_RESOURCE_DIR "${XEUS_CPP_RESOURCE_DIR}")
string(REPLACE "\\" "/" XEUS_CPP_INCLUDE_DIR "${XEUS_CPP_INCLUDE_DIR}")
endif()

configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}wasm_kernel.json.in"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}kernel.json")
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}kernel.json.in"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}kernel.json"
)
else()
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}wasm_kernel.json.in"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}kernel.json"
)
endif()

configure_file (
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}logo-32x32.png"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}"
COPYONLY)
configure_file (
COPYONLY
)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}logo-64x64.png"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}"
COPYONLY)
configure_file (
COPYONLY
)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}${kernel}logo-svg.svg"
"${CMAKE_CURRENT_BINARY_DIR}${kernel}"
COPYONLY)
COPYONLY
)
endfunction()

message("Configure kernels: ...")
if(EMSCRIPTEN)
configure_wasm_kernel("/share/jupyter/kernels/xcpp17/")
configure_wasm_kernel("/share/jupyter/kernels/xcpp20/")
configure_wasm_kernel("/share/jupyter/kernels/xcpp23/")
configure_kernel("/share/jupyter/kernels/xcpp17/" TRUE)
configure_kernel("/share/jupyter/kernels/xcpp20/" TRUE)
configure_kernel("/share/jupyter/kernels/xcpp23/" TRUE)
else()
configure_native_kernel("/share/jupyter/kernels/xcpp17/")
configure_native_kernel("/share/jupyter/kernels/xcpp20/")
configure_native_kernel("/share/jupyter/kernels/xcpp23/")
configure_kernel("/share/jupyter/kernels/xcpp17/" FALSE)
configure_kernel("/share/jupyter/kernels/xcpp20/" FALSE)
configure_kernel("/share/jupyter/kernels/xcpp23/" FALSE)
endif()

# Source files
Expand Down