File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -87,23 +87,25 @@ useSystemTbb <- function(tbbLib, tbbInc) {
8787useBundledTbb <- function () {
8888
8989 useTbbPreamble(" tbb/include" )
90- dir.create(" tbb/build" , showWarnings = FALSE )
90+ dir.create(" tbb/build-tbb " , showWarnings = FALSE )
9191
9292 writeLines(" *** configuring tbb" )
93- status <- system(" cd tbb/build; cmake -DTBB_TEST=0 -DTBB_EXAMPLES=0 -DTBB_STRICT=0 .. > build.log 2>&1" )
93+ status <- system(" cd tbb/build-tbb ; cmake -DTBB_TEST=0 -DTBB_EXAMPLES=0 -DTBB_STRICT=0 .. > build.log 2>&1" )
9494 if (status != 0L ) {
9595 system(" cat build.log" )
9696 stop(" error configuring tbb (status code " , status , " )" )
9797 }
9898
9999 writeLines(" *** building tbb" )
100- status <- system(" cd tbb/build; cmake --build . > build.log 2>&1" )
100+ status <- system(" cd tbb/build-tbb ; cmake --build . > build.log 2>&1" )
101101 if (status != 0L ) {
102102 system(" cat build.log" )
103103 stop(" error building tbb (status code " , status , " )" )
104104 }
105105
106- system(" cd tbb/build; mv *_relwithdebinfo lib_release" )
106+ dir.create(" tbb/build" , showWarnings = FALSE )
107+ system(" mv tbb/build-tbb/*_relwithdebinfo tbb/build/lib_release" )
108+ system(" rm -rf tbb/build-tbb" )
107109 writeLines(" *** finished building tbb" )
108110
109111}
You can’t perform that action at this time.
0 commit comments