Python: Upgraded boost to 1.58

This commit is contained in:
Philippe Tillet
2015-08-06 23:47:51 -07:00
parent bf866978ad
commit 080bbea9b9
2821 changed files with 12373 additions and 384959 deletions

View File

@@ -3,7 +3,7 @@ macro( addPythonExe _name _srccpp )
ADD_EXECUTABLE(${_name} ${_srccpp})
# make the pyd library link against boost_numpy python and boost
TARGET_LINK_LIBRARIES(${_name} boost_numpy ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(${_name} boost_numpy)
# put the example target into a VS solution folder named example (should
# be a no-op for Linux)
@@ -14,7 +14,7 @@ macro( addPythonMod _name _srccpp )
PYTHON_ADD_MODULE(${_name} ${_srccpp})
# make the pyd library link against boost_numpy python and boost
TARGET_LINK_LIBRARIES(${_name} boost_numpy ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(${_name} boost_numpy)
# put the example target into a VS solution folder named example (should
# be a no-op for Linux)

View File

@@ -111,8 +111,11 @@ BOOST_PYTHON_MODULE(example) {
int main(int argc, char **argv)
{
// This line makes our module available to the embedded Python intepreter.
PyImport_AppendInittab("example", &initexample);
# if PY_VERSION_HEX >= 0x03000000
PyImport_AppendInittab("example", &PyInit_example);
# else
PyImport_AppendInittab("example", &initexample);
# endif
// Initialize the Python runtime.
Py_Initialize();