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

Fixes for building shared libraries on OS X.

Browse source
This commit is contained in:
Ray Speth 2012-02-23 21:24:48 +00:00
parent b203b88085
commit ee0fe68e16
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/SConscript
View file

@ -56,6 +56,11 @@ inst = localenv.Install('$inst_libdir', lib)
buildTargets.extend(lib)
installTargets.extend(inst)
# OS X requires the shared libraries at link time
if localenv['OS'] == 'Darwin' and localenv['use_sundials'] == 'y':
localenv.Append(LIBS=['sundials_cvodes', 'sundials_nvecserial'],
LIBPATH=localenv['sundials_libdir'])
# Build the Cantera shared library
lib = localenv.SharedLibrary('../lib/cantera_shared', libraryTargets,
SPAWN=getSpawn(localenv))

6
src/python/SConscript
View file

@ -36,6 +36,12 @@ if localenv['python_package'] == 'full':
if localenv['toolchain'] == 'mingw':
pylinklibs.append('python%s' % gcv('VERSION'))
# OS X requires library dependencies to be specified at link time
if localenv['OS'] == 'Darwin':
pylinklibs.append('python%s' % gcv('VERSION'))
if localenv['use_sundials'] == 'y':
pylinklibs.extend(['sundials_cvodes', 'sundials_nvecserial'])
pymodule = localenv.SharedLibrary('#interfaces/python/Cantera/_cantera',
['pycantera.cpp'],
LIBS=pylinklibs,