Commit aae4ee3
committed
fix installation on windows without an rtools tbb
On Windows systems whose Rtools does not provide TBB (R < 4.2.0), two
code paths broke the install:
- configure required cmake whenever TBB_LIB was empty, but the bundled
TBB is never built on Windows; skip the cmake requirement there
- the tbb stub library was built unconditionally on Windows, but
tbb-compat.cpp references tbb::detail::r1::observe, which nothing
provides when TBB is disabled, so the link (and thus the install)
failed; the stub is also useless in that configuration, as
RcppParallel.dll exports no TBB symbols for old binaries to bind1 parent 1d452ff commit aae4ee3
3 files changed
Lines changed: 12 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
3 | 7 | | |
4 | 8 | | |
5 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
80 | | - | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
81 | 84 | | |
82 | 85 | | |
83 | 86 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
267 | 267 | | |
268 | 268 | | |
269 | 269 | | |
| 270 | + | |
| 271 | + | |
270 | 272 | | |
271 | | - | |
| 273 | + | |
272 | 274 | | |
273 | 275 | | |
274 | 276 | | |
| |||
0 commit comments