Skip to content

Commit c74667f

Browse files
committed
renaming LIBSUNDIALS to SUNDIALS_TARGETS; note: non-breaking change
1 parent 09b743a commit c74667f

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

make/libraries

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ $(SUNDIALS)/lib/libsundials_nvecserial.a: $(SUNDIALS_NVECSERIAL)
7979
@mkdir -p $(dir $@)
8080
$(AR) -rs $@ $^
8181

82-
LIBSUNDIALS ?= $(SUNDIALS)/lib/libsundials_nvecserial.a $(SUNDIALS)/lib/libsundials_cvodes.a $(SUNDIALS)/lib/libsundials_idas.a $(SUNDIALS)/lib/libsundials_kinsol.a
82+
SUNDIALS_TARGETS ?= $(SUNDIALS)/lib/libsundials_nvecserial.a $(SUNDIALS)/lib/libsundials_cvodes.a $(SUNDIALS)/lib/libsundials_idas.a $(SUNDIALS)/lib/libsundials_kinsol.a
8383

8484
STAN_SUNDIALS_HEADERS := $(call findfiles,$(MATH)stan,*cvodes*.hpp) $(call findfiles,$(MATH)stan,*idas*.hpp) $(call findfiles,$(MATH)stan,*kinsol*.hpp)
85-
$(STAN_SUNDIALS_HEADERS) : $(LIBSUNDIALS)
85+
$(STAN_SUNDIALS_HEADERS) : $(SUNDIALS_TARGETS)
8686

8787
clean-sundials:
8888
@echo ' cleaning sundials targets'
89-
$(RM) $(wildcard $(sort $(SUNDIALS_CVODES) $(SUNDIALS_IDAS) $(SUNDIALS_KINSOL) $(SUNDIALS_NVECSERIAL) $(LIBSUNDIALS)))
89+
$(RM) $(wildcard $(sort $(SUNDIALS_CVODES) $(SUNDIALS_IDAS) $(SUNDIALS_KINSOL) $(SUNDIALS_NVECSERIAL) $(SUNDIALS_TARGETS)
9090

9191

9292
############################################################

make/standalone

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ MATH ?= $(realpath $(MATH_MAKE)..)/
2323
# The sundials libraries are only needed for
2424
# programs using the stiff ode solver or the
2525
# algebra solver
26-
MATH_LIBS ?= $(LIBSUNDIALS) $(MPI_TARGETS) $(TBB_TARGETS)
26+
MATH_LIBS ?= $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS)
2727

2828
LDLIBS += $(MATH_LIBS)
2929

make/tests

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ test/unit/multiple_translation_units_test$(EXE): test/unit/libmultiple.so
5656
##
5757

5858
EXPRESSION_TESTS := $(subst .cpp,$(EXE),$(call findfiles,test/expressions,*_test.cpp))
59-
$(EXPRESSION_TESTS) : $(LIBSUNDIALS)
59+
$(EXPRESSION_TESTS) : $(SUNDIALS_TARGETS)
6060

6161

6262
############################################################
@@ -65,7 +65,7 @@ $(EXPRESSION_TESTS) : $(LIBSUNDIALS)
6565
##
6666

6767
CVODES_TESTS := $(subst .cpp,$(EXE),$(call findfiles,test,*cvodes*_test.cpp) $(call findfiles,test,*_bdf_*_test.cpp) $(call findfiles,test,*_adams_*_test.cpp) $(call findfiles,test,*_ode_typed_*test.cpp) $(call findfiles,test,*_ode_adjoint_typed_*test.cpp))
68-
$(CVODES_TESTS) : $(LIBSUNDIALS)
68+
$(CVODES_TESTS) : $(SUNDIALS_TARGETS)
6969

7070

7171
############################################################
@@ -74,7 +74,7 @@ $(CVODES_TESTS) : $(LIBSUNDIALS)
7474
##
7575

7676
IDAS_TESTS := $(subst .cpp,$(EXE),$(call findfiles,test,*idas*_test.cpp) $(call findfiles,test,*_dae*_test.cpp))
77-
$(IDAS_TESTS) : $(LIBSUNDIALS)
77+
$(IDAS_TESTS) : $(SUNDIALS_TARGETS)
7878

7979

8080
############################################################
@@ -83,11 +83,11 @@ $(IDAS_TESTS) : $(LIBSUNDIALS)
8383
##
8484

8585
ALGEBRA_SOLVER_TESTS := $(subst .cpp,$(EXE),$(call findfiles,test,*solve*_test.cpp))
86-
$(ALGEBRA_SOLVER_TESTS) : $(LIBSUNDIALS)
86+
$(ALGEBRA_SOLVER_TESTS) : $(SUNDIALS_TARGETS)
8787

8888
### These can be generated by the jumbo tests and include the above kinds
8989
FUNCTOR_TESTS := $(subst .cpp,$(EXE),$(call findfiles,test,functor_*_test.cpp))
90-
$(FUNCTOR_TESTS) : $(LIBSUNDIALS)
90+
$(FUNCTOR_TESTS) : $(SUNDIALS_TARGETS)
9191

9292
############################################################
9393
#

0 commit comments

Comments
 (0)