research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Firmed up support for linking against sundials.

Browse source
This commit is contained in:
Harry Moffat 2009-01-09 23:26:41 +00:00
parent f69869a685
commit 88a1a743d2
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Cantera/cxx/include/Cantera.mak.in
View file

@ -73,35 +73,40 @@ endif
#####################################################################
# CVODE/SUNDIALS LINKAGE
####################################################################
#
CANTERA_use_sundials = @use_sundials@
#
# Includes for Sundials - none for cvode
#
CANTERA_CVODE_INCLUDE=@sundials_include@
CANTERA_SUNDIALS_LIB_DIR=@sundials_lib_dir@
#
# Link line for cvode and sundials
#
ifeq ($(CANTERA_user_sundials), 1)
ifeq ($(CANTERA_use_sundials), 1)
CANTERA_CVODE_LIBS=-L$(CANTERA_SUNDIALS_LIB_DIR) @CVODE_LIBS@
CANTERA_CVODE_LIBS_DEP=@sundials_lib_dep@
else
CANTERA_CVODE_LIBS= -L$(CANTERA_LIBSDIR) @CVODE_LIBS@
CANTERA_CVODE_LIBS= -L$(CANTERA_LIBSDIR) -lcvode
CANTERA_CVODE_LIBS_DEP=$(CANTERA_LIBSDIR)/libcvode.a
endif
#
#######################################################################
# BLAS LAPACK LINKAGE
#######################################################################
#
CANTERA_build_lapack= @build_lapack@
CANTERA_build_blas= @build_blas@
CANTERA_BLAS_LAPACK_DIR= @ct_libdir@
CANTERA_BLAS_LAPACK_LIBS = -L$(CANTERA_BLAS_LAPACK_DIR) @BLAS_LAPACK_LIBS@
CANTERA_BLAS_LAPACK_LIBS_DEP=
#
#######################################################################
# CANTERA's F2C Linkage
#######################################################################
#
CANTERA_build_with_f2c= @build_with_f2c@
CANTERA_build_f2c_lib= @build_f2c_lib@
@ -110,25 +115,30 @@ CANTERA_F2C_LIBS= -L$(CANTERA_LIBSDIR) -lctf2c
else
CANTERA_F2C_LIBS= @F2C_SYSTEMLIB@
endif
#
#####################################################################
# COMBINATIONS OF INCLUDES AND LIBS
####################################################################
#
CANTERA_TOTAL_INCLUDES= $(CANTERA_CORE_INCLUDES) $(CANTERA_BOOST_INCLUDES) $(CANTERA_CVODE_INCLUDE)
#
# LIBS and LIBS should be the same ...
#
CANTERA_TOTAL_LIBS2 = -L$(CANTERA_LIBSDIR) @LOCAL_LIBS@
#
CANTERA_TOTAL_LIBS= $(CANTERA_CORE_LIBS) $(CANTERA_BOOST_LIBS) \
$(CANTERA_CVODE_LIBS) $(CANTERA_BLAS_LAPACK_LIBS) \
$(CANTERA_F2C_LIBS)
#
CANTERA_TOTAL_LIBS_DEP= $(CANTERA_CORE_LIBS_DEP) \
$(CANTERA_CVODE_LIBS_DEP) \
$(CANTERA_BLAS_LAPACK_LIBS_DEP)
#
#
# Dependency Line
#
CANTERA_LIBS_DEP= @INSTALL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
#
#####################################################################
# END
####################################################################