Skip to content

Removed redundant installation of tagfiles in lite #295

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 6 commits into
base: main
Choose a base branch
from
Open

Removed redundant installation of tagfiles in lite #295

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
889f32f
removed redundant files in lite case
kr-2003 May 6, 2025
a51b62c
removed the tagfiles installation for native case
kr-2003 May 8, 2025
db00b1d
Merge branch 'main' into tagfiles-lite
kr-2003 May 8, 2025
a89429b
reversed changes
kr-2003 May 8, 2025
456d927
Merge branch 'tagfiles-lite' of https://github.com/kr-2003/xeus-cpp i…
kr-2003 May 8, 2025
766774b
removed settings.json
kr-2003 May 8, 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
15 changes: 8 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,8 @@ if(EMSCRIPTEN)
xeus_wasm_link_options(xcpp "web,worker")
target_link_options(xcpp
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_DATA_DIR}@/share/xeus-cpp"
PUBLIC "SHELL: --preload-file ${XEUS_CPP_CONF_DIR}@/etc/xeus-cpp"
PUBLIC "SHELL: --preload-file ${XCPP_TAGFILES_DIR}@/share/xeus-cpp/tagfiles"
PUBLIC "SHELL: --preload-file ${XCPP_TAGCONFS_DIR}@/etc/xeus-cpp/tags.d"
PUBLIC "SHELL: --post-js ${CMAKE_CURRENT_SOURCE_DIR}/wasm_patches/post.js"
)
# TODO: Uncomment the above line regarding preloading clang's resource dir
Expand All @@ -458,11 +457,13 @@ include(CMakePackageConfigHelpers)

set(XEUS_CPP_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE STRING "install path for xeus-cppConfig.cmake")

install(DIRECTORY ${XCPP_TAGFILES_DIR}
DESTINATION ${XEUS_CPP_DATA_DIR})
if(NOT EMSCRIPTEN)
install(DIRECTORY ${XCPP_TAGFILES_DIR}
DESTINATION ${XEUS_CPP_DATA_DIR})

install(DIRECTORY ${XCPP_TAGCONFS_DIR}
DESTINATION ${XEUS_CPP_CONF_DIR})
install(DIRECTORY ${XCPP_TAGCONFS_DIR}
DESTINATION ${XEUS_CPP_CONF_DIR})
endif()

# Install xeus-cpp and xeus-cpp-static
if (XEUS_CPP_BUILD_SHARED)
Expand Down
Loading