Removed prefix from modules in

Modules/FDEM1D/python/CMakeLists.txt

@@ -3,7 +3,9 @@
 add_library(pyFDEM1D MODULE pyFDEM1D.cpp)
 target_link_libraries(pyFDEM1D PRIVATE pybind11::module lemmacore fdem1d )
 set_target_properties(pyFDEM1D PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}"
-                                       SUFFIX "${PYTHON_MODULE_EXTENSION}")
+                                       SUFFIX "${PYTHON_MODULE_EXTENSION}"
+                                                      OUTPUT_NAME "FDEM1D"
+)
 
 install(TARGETS pyFDEM1D
 	COMPONENT python

Modules/FDEM1D/python/pyFDEM1D.cpp

@@ -24,7 +24,7 @@
 
 namespace py = pybind11;
 
-PYBIND11_MODULE(pyFDEM1D, m) {
+PYBIND11_MODULE(FDEM1D, m) {
 
     py::add_ostream_redirect(m, "ostream_redirect");
 

Modules/LemmaCore/python/CMakeLists.txt

@@ -5,5 +5,14 @@
 add_library(pyLemmaCore MODULE pyLemmaCore.cpp)
 target_link_libraries(pyLemmaCore PRIVATE pybind11::module lemmacore )
 set_target_properties(pyLemmaCore PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}"
-                                         SUFFIX "${PYTHON_MODULE_EXTENSION}")
+                                             SUFFIX "${PYTHON_MODULE_EXTENSION}"
+                                             OUTPUT_NAME "LemmaCore"
+)
 
+
+install(TARGETS pyLemmaCore
+	COMPONENT python
+	RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/pyLemma/pyLemma/"
+	LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/pyLemma/pyLemma/"
+	ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/pyLemma/pyLemma/"
+)

Modules/LemmaCore/python/pyLemmaCore.cpp

@@ -24,7 +24,7 @@
 
 namespace py = pybind11;
 
-PYBIND11_MODULE(pyLemmaCore, m) {
+PYBIND11_MODULE(LemmaCore, m) {
 
     py::add_ostream_redirect(m, "ostream_redirect");
 

python/setup.py

@@ -12,7 +12,7 @@ class BinaryDistribution(Distribution):
 
 setup(
   name             = 'pyLemma',
-  version          = '0.0.2', 
+  version          = '0.0.4', 
   author           = 'Trevor Irons and others',
   author_email     = 'Trevor.Irons@lemmasoftware.org',
   description      = 'A short description of the app/lib',
@@ -34,7 +34,7 @@ setup(
     #'pyLemma': ['pyFDEM1D.*.so']
     #'pyLemma.pyFDEM1D': ['pyFDEM1D.*.so']
     #'pyLemma.pyFDEM1D': ['pyFDEM1D.*.so']
-    '': ['pyFDEM1D.*.so']
+    '': ['LemmaCore.*.so','FDEM1D.*.so']
   },
   zip_safe=False,
   distclass=BinaryDistribution,