Browse Source

Removed prefix from modules in

iss7
Trevor Irons 5 years ago
parent
commit
fddfb1ab25

+ 3
- 1
Modules/FDEM1D/python/CMakeLists.txt View File

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

+ 1
- 1
Modules/FDEM1D/python/pyFDEM1D.cpp View File

24
 
24
 
25
 namespace py = pybind11;
25
 namespace py = pybind11;
26
 
26
 
27
-PYBIND11_MODULE(pyFDEM1D, m) {
27
+PYBIND11_MODULE(FDEM1D, m) {
28
 
28
 
29
     py::add_ostream_redirect(m, "ostream_redirect");
29
     py::add_ostream_redirect(m, "ostream_redirect");
30
 
30
 

+ 10
- 1
Modules/LemmaCore/python/CMakeLists.txt View File

5
 add_library(pyLemmaCore MODULE pyLemmaCore.cpp)
5
 add_library(pyLemmaCore MODULE pyLemmaCore.cpp)
6
 target_link_libraries(pyLemmaCore PRIVATE pybind11::module lemmacore )
6
 target_link_libraries(pyLemmaCore PRIVATE pybind11::module lemmacore )
7
 set_target_properties(pyLemmaCore PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}"
7
 set_target_properties(pyLemmaCore PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}"
8
-                                         SUFFIX "${PYTHON_MODULE_EXTENSION}")
8
+                                             SUFFIX "${PYTHON_MODULE_EXTENSION}"
9
+                                             OUTPUT_NAME "LemmaCore"
10
+)
9
 
11
 
12
+
13
+install(TARGETS pyLemmaCore
14
+	COMPONENT python
15
+	RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/pyLemma/pyLemma/"
16
+	LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/pyLemma/pyLemma/"
17
+	ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/pyLemma/pyLemma/"
18
+)

+ 1
- 1
Modules/LemmaCore/python/pyLemmaCore.cpp View File

24
 
24
 
25
 namespace py = pybind11;
25
 namespace py = pybind11;
26
 
26
 
27
-PYBIND11_MODULE(pyLemmaCore, m) {
27
+PYBIND11_MODULE(LemmaCore, m) {
28
 
28
 
29
     py::add_ostream_redirect(m, "ostream_redirect");
29
     py::add_ostream_redirect(m, "ostream_redirect");
30
 
30
 

+ 2
- 2
python/setup.py View File

12
 
12
 
13
 setup(
13
 setup(
14
   name             = 'pyLemma',
14
   name             = 'pyLemma',
15
-  version          = '0.0.2', 
15
+  version          = '0.0.4', 
16
   author           = 'Trevor Irons and others',
16
   author           = 'Trevor Irons and others',
17
   author_email     = 'Trevor.Irons@lemmasoftware.org',
17
   author_email     = 'Trevor.Irons@lemmasoftware.org',
18
   description      = 'A short description of the app/lib',
18
   description      = 'A short description of the app/lib',
34
     #'pyLemma': ['pyFDEM1D.*.so']
34
     #'pyLemma': ['pyFDEM1D.*.so']
35
     #'pyLemma.pyFDEM1D': ['pyFDEM1D.*.so']
35
     #'pyLemma.pyFDEM1D': ['pyFDEM1D.*.so']
36
     #'pyLemma.pyFDEM1D': ['pyFDEM1D.*.so']
36
     #'pyLemma.pyFDEM1D': ['pyFDEM1D.*.so']
37
-    '': ['pyFDEM1D.*.so']
37
+    '': ['LemmaCore.*.so','FDEM1D.*.so']
38
   },
38
   },
39
   zip_safe=False,
39
   zip_safe=False,
40
   distclass=BinaryDistribution,
40
   distclass=BinaryDistribution,

Loading…
Cancel
Save