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
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# RcppParallel (development version)

* Fixed installation on Windows systems whose Rtools does not provide TBB
(R < 4.2.0): configure no longer requires cmake there, and the tbb stub
library is no longer built when the TBB backend is disabled.

* RcppParallel now reports which TBB headers and libraries are installed
with the package, and from where, during package installation. In
addition, setting the `VERBOSE` environment variable to a value other
Expand Down
7 changes: 5 additions & 2 deletions src/install.libs.R
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,11 @@
}

# on Windows, we create a stub library that links to us so that
# older binaries (like rstan) can still load
if (.Platform$OS.type == "windows") {
# older binaries (like rstan) can still load. this is only relevant
# when TBB is available: the stub cannot link without it, and old
# TBB-using binaries could not run against a TBB-less RcppParallel
# regardless
if (.Platform$OS.type == "windows" && TBB_ENABLED) {
tbbDll <- file.path(tbbDest, "tbb.dll")
if (file.exists(tbbDll)) {
writeLines("** tbb.dll already exists; skipping tbb stub library")
Expand Down
4 changes: 3 additions & 1 deletion tools/config/configure.R
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,10 @@ if (.Platform$OS.type == "windows") {
define(PKG_LIBS = paste(pkgLibs, collapse = " "))

# if we're going to build tbb from sources, check for cmake
# (not required on Windows, where the bundled TBB is never built;
# without an Rtools TBB, the tinythread fallback is used instead)
define(CMAKE = "")
if (is.na(tbbLib)) {
if (is.na(tbbLib) && .Platform$OS.type != "windows") {

cmake <- local({

Expand Down
Loading