Skip to content

Commit ded2e9a

Browse files
authored
Merge pull request #151 from fbourgin/update_xtensor_0.27
Update xtensor 0.27
2 parents 79d446b + 2b9c694 commit ded2e9a

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.github/workflows/linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
echo "which tar"
7979
which tar
8080
export TAR="/usr/bin/tar"
81-
R -e "library(devtools); install_github('fbourgin/Xtensor.R', ref = 'update_xtensor', configure.args = '--novendor')"
81+
R -e "library(devtools); install_github('fbourgin/Xtensor.R', ref = 'update_xtensor_0.27', configure.args = '--novendor')"
8282
8383
- name: print R HOME
8484
run: |
@@ -96,7 +96,7 @@ jobs:
9696
if [[ "${{matrix.sys.compiler}}" = "gcc" ]]; then export CC=gcc-${{matrix.sys.version}}; export CXX=g++-${{matrix.sys.version}}; else export CC=clang; export CXX=clang++; fi
9797
mkdir ~/.R
9898
touch ~/.R/Makevars
99-
echo "CXX17=$CXX" >> ~/.R/Makevars
100-
echo "CXX17FLAGS=-fPIC -O2" >> ~/.R/Makevars
99+
echo "CXX20=$CXX" >> ~/.R/Makevars
100+
echo "CXX20FLAGS=-fPIC -O2 -std=c++20" >> ~/.R/Makevars
101101
Rscript ./unittest.R
102102

.github/workflows/osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
echo "which tar"
5252
which tar
5353
export TAR="/usr/bin/tar"
54-
R -e "library(devtools); install_github('fbourgin/Xtensor.R', ref = 'update_xtensor', configure.args = '--novendor')"
54+
R -e "library(devtools); install_github('fbourgin/Xtensor.R', ref = 'update_xtensor_0.27', configure.args = '--novendor')"
5555
5656
- name: print R HOME
5757
run: |

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ set(XTENSOR_R_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
1616
# Versionning
1717
# ===========
1818

19-
set(XTENSOR_REQUIRED_VERSION 0.26.0)
20-
set(XTL_REQUIRED_VERSION 0.8.0)
19+
set(XTENSOR_REQUIRED_VERSION 0.27.1)
20+
set(XTL_REQUIRED_VERSION 0.8.1)
2121

2222
set(XTENSOR_R_CONFIG_FILE
2323
"${XTENSOR_R_INCLUDE_DIR}/xtensor-r/xtensor_r_config.hpp")
@@ -57,7 +57,7 @@ add_library(xtensor-r INTERFACE)
5757
target_include_directories(xtensor-r INTERFACE $<BUILD_INTERFACE:${XTENSOR_R_INCLUDE_DIR}>
5858
$<INSTALL_INTERFACE:include>)
5959

60-
target_compile_features(xtensor-r INTERFACE cxx_std_17)
60+
target_compile_features(xtensor-r INTERFACE cxx_std_20)
6161

6262
target_link_libraries(xtensor-r INTERFACE xtensor)
6363
get_target_property(inc_dir xtensor-r INTERFACE_INCLUDE_DIRECTORIES)

environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- cmake
6-
- xtensor=0.26.0
6+
- xtensor=0.27.1
77
- r-base
88
- r-rcpp
99
# test dependencies

test/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ include(CheckCXXCompilerFlag)
3232
string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
3333

3434
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
35-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion")
36-
CHECK_CXX_COMPILER_FLAG("-std=c++17" HAS_CPP17_FLAG)
35+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion -D_LIBCPP_DISABLE_AVAILABILITY")
36+
CHECK_CXX_COMPILER_FLAG("-std=c++20" HAS_CPP20_FLAG)
3737

38-
if (HAS_CPP17_FLAG)
39-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
38+
if (HAS_CPP20_FLAG)
39+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
4040
else()
41-
message(FATAL_ERROR "Unsupported compiler -- xtensor requires C++17 support!")
41+
message(FATAL_ERROR "Unsupported compiler -- xtensor requires C++20 support!")
4242
endif()
4343
endif()
4444

test/rcpp_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* The full license is in the file LICENSE, distributed with this software. *
88
****************************************************************************/
99

10-
// [[Rcpp::plugins(cpp17)]]
10+
// [[Rcpp::plugins(cpp20)]]
1111
// [[Rcpp::depends(xtensor)]]
1212

1313
#include "xtensor-r/rcontainer.hpp"

0 commit comments

Comments
 (0)