Candidate_v1.7.0
stable
|
Last change
on this file since 1ca493a was 1ca493a, checked in by Frederik Heber <frederik.heber@…>, 5 years ago |
|
Allowing python3 usage.
- Init function name changes on python2/3.
- added test and AC_DEFINEs to configure.ac.
- PythonScripting branches on these preprocessor defines.
- removed ax_python.m4.
- FIX: boost.m4 overwrites BOOST_PYTHON_LIBS pulled from python-config
which caused the issues with ax_python.m4 and boost.m4 checking for
different python versions.
Added BOOST_PYTHON_LIB which contains the python libs needed.
|
-
Property mode
set to
100644
|
|
File size:
1012 bytes
|
| Rev | Line | |
|---|
| [7672284] | 1 | AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS} ${JobMarket_LDFLAGS}
|
|---|
| 2 | AM_CPPFLAGS = \
|
|---|
| 3 | -I$(top_srcdir)/src \
|
|---|
| 4 | -I$(top_srcdir)/src/unittests \
|
|---|
| 5 | -I$(top_srcdir)/src/Actions \
|
|---|
| 6 | -I$(top_srcdir)/src/UIElements \
|
|---|
| 7 | -I$(top_srcdir)/ThirdParty/LinearAlgebra/src \
|
|---|
| 8 | ${BOOST_CPPFLAGS} \
|
|---|
| 9 | ${CodePatterns_CFLAGS}
|
|---|
| 10 |
|
|---|
| 11 |
|
|---|
| 12 | if CONDPYTHON
|
|---|
| 13 | pyexec_LTLIBRARIES = pyMoleCuilder.la
|
|---|
| 14 | pyMoleCuilder_la_SOURCES = \
|
|---|
| [86f27c] | 15 | cleanUp.cpp \
|
|---|
| [7672284] | 16 | ../src/cleanUp.hpp \
|
|---|
| 17 | ../src/Actions/Action_impl_python.hpp \
|
|---|
| 18 | ../src/Actions/GlobalListOfActions.hpp \
|
|---|
| 19 | ../src/Actions/ActionHistory.hpp
|
|---|
| [1ca493a] | 20 | pyMoleCuilder_la_CPPFLAGS = \
|
|---|
| 21 | $(AM_CPPFLAGS) \
|
|---|
| 22 | ${BOOST_CPPFLAGS} \
|
|---|
| 23 | ${CodePatterns_CFLAGS} \
|
|---|
| 24 | $(JobMarket_CFLAGS) \
|
|---|
| 25 | $(BOOST_PYTHON_CPPFLAGS)
|
|---|
| 26 | pyMoleCuilder_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info $(MOLECUILDER_SO_VERSION) -shared $(BOOST_PYTHON_LDFLAGS) $(BOOST_PYTHON_LDFLAGS)
|
|---|
| [7672284] | 27 | pyMoleCuilder_la_LIBADD = \
|
|---|
| 28 | $(top_builddir)/src/libMolecuilderUI.la
|
|---|
| 29 | pyMoleCuilder_la_LIBADD += \
|
|---|
| 30 | $(BOOST_PYTHON_LIBS) \
|
|---|
| [1ca493a] | 31 | $(BOOST_PYTHON_LIB) \
|
|---|
| 32 | ${CodePatterns_LIBS}
|
|---|
| [7672284] | 33 | endif
|
|---|
| 34 |
|
|---|
| 35 |
|
|---|
| 36 |
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
