Skip to content

Commit

Permalink
Merge pull request #144 from JohanMabille/upgrade_xtensor
Browse files Browse the repository at this point in the history
Upgraded to xtensor 0.25.0
  • Loading branch information
JohanMabille authored Jan 31, 2024
2 parents 0b924a1 + db06e47 commit c20f7a4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ set(XTENSOR_R_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
# Versionning
# ===========

set(XTENSOR_REQUIRED_VERSION 0.24.4)
set(XTL_REQUIRED_VERSION 0.7.5)
set(XTENSOR_REQUIRED_VERSION 0.25.0)
set(XTL_REQUIRED_VERSION 0.7.7)

set(XTENSOR_R_CONFIG_FILE
"${XTENSOR_R_INCLUDE_DIR}/xtensor-r/xtensor_r_config.hpp")
Expand Down
2 changes: 1 addition & 1 deletion environment-dev-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
dependencies:
- cmake
- xtensor=0.24.4
- xtensor=0.25.0
- r-base
- r-rcpp
- m2w64-gcc
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
dependencies:
- cmake
- xtensor=0.24.4
- xtensor=0.25.0
- r-base
- r-rcpp
# test dependencies
Expand Down

0 comments on commit c20f7a4

Please sign in to comment.