From 803d5e3c4c71faa1dbcc166e6925ce3748249bad Mon Sep 17 00:00:00 2001 From: Jiaming Yuan Date: Thu, 2 Mar 2023 06:49:39 +0800 Subject: [PATCH] Update c++ requirement to 17 for the R package. (#8860) --- R-package/DESCRIPTION | 2 +- R-package/configure | 6 +++--- R-package/configure.ac | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION index 3b230ac87..9ceef2fda 100644 --- a/R-package/DESCRIPTION +++ b/R-package/DESCRIPTION @@ -66,4 +66,4 @@ Imports: jsonlite (>= 1.0), RoxygenNote: 7.2.3 Encoding: UTF-8 -SystemRequirements: GNU make, C++14 +SystemRequirements: GNU make, C++17 diff --git a/R-package/configure b/R-package/configure index 834cb95c2..19ea48a91 100755 --- a/R-package/configure +++ b/R-package/configure @@ -2096,9 +2096,9 @@ if test -z "${R_HOME}"; then exit 1 fi -CXX14=`"${R_HOME}/bin/R" CMD config CXX14` -CXX14STD=`"${R_HOME}/bin/R" CMD config CXX14STD` -CXX="${CXX14} ${CXX14STD}" +CXX17=`"${R_HOME}/bin/R" CMD config CXX17` +CXX17STD=`"${R_HOME}/bin/R" CMD config CXX17STD` +CXX="${CXX17} ${CXX17STD}" CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` CC=`"${R_HOME}/bin/R" CMD config CC` diff --git a/R-package/configure.ac b/R-package/configure.ac index 4e6cfee70..1fb6ea35a 100644 --- a/R-package/configure.ac +++ b/R-package/configure.ac @@ -10,9 +10,9 @@ if test -z "${R_HOME}"; then exit 1 fi -CXX14=`"${R_HOME}/bin/R" CMD config CXX14` -CXX14STD=`"${R_HOME}/bin/R" CMD config CXX14STD` -CXX="${CXX14} ${CXX14STD}" +CXX17=`"${R_HOME}/bin/R" CMD config CXX17` +CXX17STD=`"${R_HOME}/bin/R" CMD config CXX17STD` +CXX="${CXX17} ${CXX17STD}" CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` CC=`"${R_HOME}/bin/R" CMD config CC`