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
12 changes: 6 additions & 6 deletions ports/xtensor/fix-find-tbb-and-install-destination.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7ec920..6f46641 100644
index 38b5ba17..ccf71c51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,8 +75,8 @@ if(XTENSOR_USE_XSIMD)
@@ -86,8 +86,8 @@ if(XTENSOR_USE_XSIMD)
endif()

if(XTENSOR_USE_TBB)
Expand All @@ -13,7 +13,7 @@ index c7ec920..6f46641 100644
message(STATUS "Found intel TBB: ${TBB_INCLUDE_DIRS}")
endif()

@@ -260,7 +260,7 @@ export(EXPORT ${PROJECT_NAME}-targets
@@ -272,7 +272,7 @@ export(EXPORT ${PROJECT_NAME}-targets
install(DIRECTORY ${XTENSOR_INCLUDE_DIR}/xtensor
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

Expand All @@ -22,12 +22,12 @@ index c7ec920..6f46641 100644
STRING "install path for xtensorConfig.cmake")

configure_package_config_file(${PROJECT_NAME}Config.cmake.in
@@ -287,7 +287,7 @@ configure_file(${PROJECT_NAME}.pc.in
@@ -299,7 +299,7 @@ configure_file(${PROJECT_NAME}.pc.in
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
@ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/")
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")

# Write single include
# ====================
install(DIRECTORY ${XTENSOR_TAGFILES_DIR}
DESTINATION ${XTENSOR_DATA_DIR})
2 changes: 1 addition & 1 deletion ports/xtensor/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xtensor-stack/xtensor
REF "${VERSION}"
SHA512 52616a61f9c74c9a37daea5615edb210ff9ef636620266c04ef3e145a067ed685c36febdee4d225ff7c4865e45384e92034a0e7bf9d255727aca7100bc45143c
SHA512 3f3fe2391df91518cfef4983ff66bf3b79940136582bb99c6270f87481bf9d2cc15605b13f9b70b6ee9a7a89b389037dd2b26362fcae0fdc49f5204872ee5291
HEAD_REF master
PATCHES
fix-find-tbb-and-install-destination.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/xtensor/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xtensor",
"version": "0.27.0",
"version": "0.27.1",
"description": "C++ tensors with broadcasting and lazy computing",
"homepage": "https://github.com/xtensor-stack/xtensor",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -10793,7 +10793,7 @@
"port-version": 0
},
"xtensor": {
"baseline": "0.27.0",
"baseline": "0.27.1",
"port-version": 0
},
"xtensor-blas": {
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/xtensor.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b780dfb77f45d45a844650e567178fb1229055c6",
"version": "0.27.1",
"port-version": 0
},
{
"git-tree": "43291e36aaad6a1ec14605cbb7eb6059f3c4ccec",
"version": "0.27.0",
Expand Down