Skip to content

Commit 1a4ce81

Browse files
committed
Make LLVM_RESOURCE_DIR an option that can be provided by the user
1 parent 51aeae3 commit 1a4ce81

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ if(XEUS_CPP_ENABLE_CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
7575
endif()
7676

7777
if(EMSCRIPTEN)
78+
# Other options
79+
option(LLVM_RESOURCE_DIR "Emscripten LLVM resource directory" "unknown")
7880
add_compile_definitions(XEUS_CPP_EMSCRIPTEN_WASM_BUILD)
7981
message("Build with emscripten")
8082
set(XEUS_CPP_BUILD_STATIC ON)
@@ -435,10 +437,14 @@ if(EMSCRIPTEN)
435437
xeus_cpp_set_kernel_options(xcpp)
436438
xeus_wasm_compile_options(xcpp)
437439
xeus_wasm_link_options(xcpp "web,worker")
440+
if(NOT DEFINED LLVM_RESOURCE_DIR)
441+
set(LLVM_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}${XEUS_CPP_RESOURCE_DIR})
442+
message(STATUS "LLVM_RESOURCE_DIR not defined, using fallback value: ${CMAKE_INSTALL_PREFIX}${XEUS_CPP_RESOURCE_DIR}")
443+
endif()
438444
target_link_options(xcpp
439445
PUBLIC "SHELL: -s USE_SDL=2"
440446
PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
441-
PUBLIC "SHELL: --preload-file ${CMAKE_INSTALL_PREFIX}${XEUS_CPP_RESOURCE_DIR}@${XEUS_CPP_RESOURCE_DIR}"
447+
PUBLIC "SHELL: --preload-file ${LLVM_RESOURCE_DIR}@${LLVM_RESOURCE_DIR}"
442448
PUBLIC "SHELL: --preload-file ${XEUS_CPP_DATA_DIR}@/share/xeus-cpp"
443449
PUBLIC "SHELL: --preload-file ${XEUS_CPP_CONF_DIR}@/etc/xeus-cpp"
444450
PUBLIC "SHELL: --post-js ${CMAKE_CURRENT_SOURCE_DIR}/wasm_patches/post.js"

0 commit comments

Comments
 (0)