fix boost python

Author: thelfer

bindings/python/boost/src/CMakeLists.txt

@@ -20,7 +20,7 @@ function(mgis_python_module name output_name)
   # include directories
   target_include_directories(${module}
     SYSTEM
-    PRIVATE "${PROJECT_SOURCE_DIR}/bindings/python/include"
+    PRIVATE "${PROJECT_SOURCE_DIR}/bindings/python/boost/include"
     PRIVATE "${Boost_INCLUDE_DIRS}")
   # Link flags for python modules.
   #
@@ -37,7 +37,7 @@ function(mgis_python_module name output_name)
       target_link_libraries(${module}
         PRIVATE
         MFrontGenericInterface
-        ${CONAN_LIBS} Python::NumPy Python::Module)
+        ${CONAN_LIBS} Python::Python Python::NumPy)
     else(APPLE)
       target_link_libraries(${module}
         PRIVATE
@@ -57,7 +57,8 @@ function(mgis_python_module name output_name)
       target_link_libraries(${module}
         PRIVATE
         MFrontGenericInterface
-        ${Boost_NUMPY_LIBRARY} ${Boost_PYTHON_LIBRARY} Python::NumPy Python::Module)
+        ${Boost_NUMPY_LIBRARY} ${Boost_PYTHON_LIBRARY}
+	Python::Python Python::NumPy)
     endif(disable_python_library_linking) 
   endif(MGIS_USES_CONAN)
   # installation

bindings/python/boost/src/NumPySupport.cxx

@@ -13,16 +13,26 @@
  */
 
 #include <numpy/ndarrayobject.h>
-#include <boost/python/numpy.hpp>
+// #include <boost/python/numpy.hpp>
 #include "MGIS/Raise.hxx"
 #include "MGIS/Python/NumPySupport.hxx"
 
 namespace mgis::python {
 
-  void initializeNumPy() { 
-    Py_Initialize();
-    boost::python::numpy::initialize();
- }  // end of initializeNumPy
+#if PY_MAJOR_VERSION == 2
+  static void wrapInitializeNumPy() { import_array(); }
+#else
+  static void* wrapInitializeNumPy() {
+    import_array();
+    return nullptr;
+  }
+#endif
+
+  void initializeNumPy() { wrapInitializeNumPy(); }  // end of initializeNumPy
+
+//  void initializeNumPy() { wrapInitializeNumPy(); }  // end of initializeNumPy  void initializeNumPy() { 
+//    boost::python::numpy::initialize();
+// }  // end of initializeNumPy
 
   boost::python::object wrapInNumPyArray(std::span<double>& v) {
     npy_intp dims[1] = {static_cast<npy_intp>(v.size())};