clib.dll needs to be copied by hand
This commit is contained in:
parent
d021f3f7dc
commit
dad2ab22ff
1 changed files with 15 additions and 2 deletions
|
|
@ -9,6 +9,9 @@
|
||||||
#
|
#
|
||||||
###############################################################
|
###############################################################
|
||||||
|
|
||||||
|
have_python_site_package_topdir=@local_python_inst@
|
||||||
|
python_site_package_topdir=@python_prefix@
|
||||||
|
|
||||||
CANTERA_LIBDIR= @buildlib@
|
CANTERA_LIBDIR= @buildlib@
|
||||||
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
|
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
|
||||||
$(CANTERA_LIBDIR)/liboneD.a \
|
$(CANTERA_LIBDIR)/liboneD.a \
|
||||||
|
|
@ -41,10 +44,20 @@ _build: $(SRCS) $(LIB_DEPS)
|
||||||
(CXX=@CXX@; export CXX; CC=@CC@; export CC; @PYTHON_CMD@ setup.py build)
|
(CXX=@CXX@; export CXX; CC=@CC@; export CC; @PYTHON_CMD@ setup.py build)
|
||||||
echo 'ok' > _build
|
echo 'ok' > _build
|
||||||
|
|
||||||
|
#
|
||||||
|
# HKM -> If clib is built as a dll, it needs to be copied by hand to the
|
||||||
|
# site package directory.
|
||||||
|
#
|
||||||
|
CLIB_DLL=../../build/lib/i686-pc-win32/clib.dll
|
||||||
|
CLIB_EXP=../../build/lib/i686-pc-win32/clib.exp
|
||||||
|
|
||||||
_winbuild: $(SRCS) $(WIN_LIB_DEPS)
|
_winbuild: $(SRCS) $(WIN_LIB_DEPS) $(CLIB_DLL)
|
||||||
touch src/pycantera.cpp
|
touch src/pycantera.cpp
|
||||||
(@PYTHON_CMD@ setup.py build)
|
(@PYTHON_CMD@ setup.py build)
|
||||||
|
ifeq ($(have_python_site_package_topdir), 1)
|
||||||
|
(@INSTALL@ -m 755 $(CLIB_DLL) $(CLIB_EXP) \
|
||||||
|
$(python_site_package_topdir)/lib/site-packages/Cantera)
|
||||||
|
endif
|
||||||
echo 'ok' > _winbuild
|
echo 'ok' > _winbuild
|
||||||
|
|
||||||
minbuild:
|
minbuild:
|
||||||
|
|
@ -52,7 +65,7 @@ minbuild:
|
||||||
|
|
||||||
install:
|
install:
|
||||||
ifeq (@local_python_inst@,1)
|
ifeq (@local_python_inst@,1)
|
||||||
(@PYTHON_CMD@ setup.py install --prefix=@python_prefix@)
|
(@PYTHON_CMD@ setup.py install --prefix="@python_prefix@")
|
||||||
else
|
else
|
||||||
(@PYTHON_CMD@ setup.py install)
|
(@PYTHON_CMD@ setup.py install)
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue