WIP: Refactored bindings

bindings/python/CMakeLists.txt

@@ -1,34 +1,31 @@
 pybind11_add_module(adios2py MODULE
-  ADIOSPy.h
-  ADIOSPy.cpp
-  adiosPyFunctions.h
-  adiosPyFunctions.cpp
-  adiosPyTypes.h
-  EnginePy.h
-  EnginePy.inl
-  EnginePy.cpp
-  gluePyBind11.cpp
-  IOPy.h
-  IOPy.cpp
-  VariablePy.h
-  VariablePy.cpp
+  adios2py.cpp
+  PyAttribute.cpp
+  PyADIOS.cpp
+  PyEnums.cpp
+  PyEngine.cpp
+  PyIO.cpp
+  PyVariable.cpp
 )
+target_include_directories(adios2py PRIVATE ${ADIOS2_SOURCE_DIR}/source/adios2/engine/pyengine)
 target_link_libraries(adios2py PRIVATE adios2)
 if(ADIOS2_HAVE_MPI)
   target_link_libraries(adios2py PRIVATE PythonModule::mpi4py)
 endif()
 
-string(REGEX REPLACE
-  "^${PYTHON_PREFIX}/[^/]*/python" "${CMAKE_INSTALL_LIBDIR}/python"
-  CMAKE_INSTALL_PYTHONDIR "${PYTHON_SITE_PACKAGES}"
+set(PY_VERSION_STRING "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}")
+set(CMAKE_INSTALL_PYTHONDIR
+  "${CMAKE_INSTALL_LIBDIR}/python${PY_VERSION_STRING}/site-packages"
 )
 set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR}"
   CACHE INTERNAL "" FORCE
 )
+message("  ******** adios2py output directory: ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}")
 set_target_properties(adios2py PROPERTIES
   OUTPUT_NAME adios2
   LIBRARY_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}
   RUNTIME_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}
+  ARCHIVE_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}
 )
 install(TARGETS adios2py 
   DESTINATION ${CMAKE_INSTALL_PYTHONDIR}