Skip to content

Commit c6e1550

Browse files
committed
Minor edits / improvements to configure* and src/Makevars*
1 parent 2b71af6 commit c6e1550

File tree

4 files changed

+2
-32
lines changed

4 files changed

+2
-32
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3299,7 +3299,7 @@ printf "%s\n" "yes, but without OpenMP as version ${gxx_version} (Armadillo cons
32993299
## we know this one is bad
33003300
can_use_openmp="no"
33013301
;;
3302-
5.4*|5.5*|5.6*|5.7*|5.8*|5.9*|6.*|7.*|8.*|9.*|10.*|11.*|12.*)
3302+
5.4*|5.5*|5.6*|5.7*|5.8*|5.9*|6.*|7.*|8.*|9.*|1?.*)
33033303
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, with OpenMP as version ${gxx_version}" >&5
33043304
printf "%s\n" "yes, with OpenMP as version ${gxx_version}" >&6; }
33053305
## we know this one is good, yay

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ if test x"${openmp_already_works}" = x"no"; then
9292
## we know this one is bad
9393
can_use_openmp="no"
9494
;;
95-
5.4*|5.5*|5.6*|5.7*|5.8*|5.9*|6.*|7.*|8.*|9.*|10.*|11.*|12.*)
95+
5.4*|5.5*|5.6*|5.7*|5.8*|5.9*|6.*|7.*|8.*|9.*|1?.*)
9696
AC_MSG_RESULT([yes, with OpenMP as version ${gxx_version}])
9797
## we know this one is good, yay
9898
can_use_openmp="yes"

src/Makevars.in

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,3 @@
33
PKG_CPPFLAGS = -I../inst/include
44
PKG_CXXFLAGS = @OPENMP_FLAG@
55
PKG_LIBS= @OPENMP_FLAG@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
6-
7-
## With R 3.1.0 or later, you can uncomment the following line to tell R to
8-
## enable compilation with C++11 (where available)
9-
##
10-
## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider
11-
## availability of the package we do not yet enforce this here. It is however
12-
## recommended for client packages to set it.
13-
##
14-
## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP
15-
## support within Armadillo prefers / requires it
16-
##
17-
## R 4.0.0 made C++11 the default, R 4.1.0 switched to C++14, R 4.3.0 to C++17
18-
## _In general_ we should no longer need to set a standard as any recent R
19-
## installation will do the right thing. Should you need it, uncomment it and
20-
## set the appropriate value, possibly CXX17.

src/Makevars.win

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,3 @@
22

33
PKG_CXXFLAGS = -I../inst/include -I. $(SHLIB_OPENMP_CXXFLAGS)
44
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
5-
6-
## With R 3.1.0 or later, you can uncomment the following line to tell R to
7-
## enable compilation with C++11 (where available)
8-
##
9-
## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider
10-
## availability of the package we do not yet enforce this here. It is however
11-
## recommended for client packages to set it.
12-
##
13-
## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP
14-
## support within Armadillo prefers / requires it
15-
##
16-
## R 4.0.0 made C++11 the default, R 4.1.0 switched to C++14, R 4.3.0 to C++17
17-
## _In general_ we should no longer need to set a standard as any recent R
18-
## installation will do the right thing. Should you need it, uncomment it and
19-
## set the appropriate value, possibly CXX17.

0 commit comments

Comments
 (0)