Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,6 @@ __pycache__
# Generated files
*.pc
.vscode/settings.json

# Allow tag JSONs under etc/xeus-cpp
!etc/xeus-cpp/tags.d/
17 changes: 17 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ project(xtensor CXX)

set(XTENSOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)

# xtensor tag files
set(XTENSOR_DATA_DIR "share/xeus-cpp")
set(XTENSOR_TAGFILES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/share/xeus-cpp/tagfiles)

set(XTENSOR_CONF_DIR "etc/xeus-cpp")
set(XTENSOR_TAGCONFS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/etc/xeus-cpp/tags.d)

file(COPY "${XTENSOR_TAGFILES_DIR}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/share/xeus-cpp")
file(COPY "${XTENSOR_TAGCONFS_DIR}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/etc/xeus-cpp")


# Versionning
# ===========

Expand Down Expand Up @@ -290,6 +301,12 @@ configure_file(${PROJECT_NAME}.pc.in
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/")

install(DIRECTORY ${XTENSOR_TAGFILES_DIR}
DESTINATION ${XTENSOR_DATA_DIR})

install(DIRECTORY ${XTENSOR_TAGCONFS_DIR}
DESTINATION ${XTENSOR_CONF_DIR})

# Write single include
# ====================

Expand Down
2 changes: 1 addition & 1 deletion docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Changelog
`# 2848 https://github.com/xtensor-stack/xtensor/pull/2848`
- Revive benchmarks
`# 2854 https://github.com/xtensor-stack/xtensor/pull/2854`
- Set cmake min version to represent used features.
- Set cmake min version to represent used features.
`# 2852 https://github.com/xtensor-stack/xtensor/pull/2852`
- Enabling rich display for xeus-cpp-lite
`# 2853 https://github.com/xtensor-stack/xtensor/pull/2853`
Expand Down
4 changes: 4 additions & 0 deletions etc/xeus-cpp/tags.d/xtensor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"tagfile": "xtensor.tag",
"url": "https://xtensor.readthedocs.io/en/latest/"
}
Loading
Loading