From b4230e98f665da643030e596c935a4e1bc14dba4 Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Mon, 4 Jun 2018 09:34:00 -0400 Subject: [PATCH] Fix auto-linking logic for boost_numpy (Windows only). --- include/boost/python/numpy/config.hpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/boost/python/numpy/config.hpp b/include/boost/python/numpy/config.hpp index e6484bc5..f70b94cb 100644 --- a/include/boost/python/numpy/config.hpp +++ b/include/boost/python/numpy/config.hpp @@ -62,7 +62,9 @@ // Set the name of our library, this will get undef'ed by auto_link.hpp // once it's done with it: // -#define BOOST_LIB_NAME boost_numpy##PY_MAJOR_VERSION##PY_MINOR_VERSION +#define _BOOST_PYTHON_CONCAT(N, M, m) N ## M ## m +#define BOOST_PYTHON_CONCAT(N, M, m) _BOOST_PYTHON_CONCAT(N, M, m) +#define BOOST_LIB_NAME BOOST_PYTHON_CONCAT(boost_numpy, PY_MAJOR_VERSION, PY_MINOR_VERSION) // // If we're importing code from a dll, then tell auto_link.hpp about it: // @@ -75,6 +77,9 @@ #include #endif // auto-linking disabled +#undef BOOST_PYTHON_CONCAT +#undef _BOOST_PYTHON_CONCAT + #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION #endif // CONFIG_NUMPY20170215_H_