Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows: Don't try to copy tbb.dll if TBB_TARGETS is undefined #1285

Merged
merged 2 commits into from
Aug 26, 2024
Merged

Windows: Don't try to copy tbb.dll if TBB_TARGETS is undefined #1285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05e2d79
Windows: Don't try to copy tbb.dll if TBB_TARGETS is undefined
WardBrian Jul 8, 2024
8780146
Missing whitespace
WardBrian Jul 9, 2024
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
2 changes: 2 additions & 0 deletions make/program
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ endif
$(LINK.cpp) $(subst \,/,$*.o) $(CMDSTAN_MAIN_O) $(LDLIBS) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(subst \,/,$(OUTPUT_OPTION))

ifeq ($(OS),Windows_NT)
ifneq (,$(TBB_TARGETS))
ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll))))
@echo 'Intel TBB is not in PATH.'
@echo 'Consider calling '
Expand All @@ -94,6 +95,7 @@ ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll))))
fi
endif
endif
endif

$(patsubst %.cpp,%$(STAN_FLAGS).d,$(CMDSTAN_MAIN)) : $(CMDSTAN_MAIN)
$(COMPILE.cpp) $(DEPFLAGS) $<
Expand Down