Updates for swig target naming, and some comments

Author: julesghub

src/underworld/__init__.py

@@ -61,9 +61,11 @@
 
 from ._version import __version__
 
-# insert directory for binaries in python search path
+# insert directory for binaries (.so/.dylibs) to be found
+# when import libUnderworld -> import libUnderworldPy 
 import os as _os
 _sys.path.append(_os.path.join(__file__[:-11],'lib'))
+
 # squelch h5py/numpy future warnings
 import warnings as _warnings
 _warnings.simplefilter(action='ignore', category=FutureWarning)
@@ -77,6 +79,8 @@
 from . import libUnderworld as _libUnderworld
 from . import _stgermain
 _data =  _libUnderworld.StGermain_Tools.StgInit( _sys.argv )
+
+# LoadModules relies on the 'lib' path appended above to be correct
 _stgermain.LoadModules( {"import":["StgDomain","StgFEM","PICellerator","Underworld","gLucifer","Solvers"]} )
 
 class _del_uw_class:

src/underworld/libUnderworld/libUnderworldPy/CMakeLists.txt

@@ -41,17 +41,17 @@ message("End Swig diagnostics:")
 
 set_source_files_properties(Function.i PROPERTIES CPLUSPLUS ON SWIG_MODULE_NAME Function) 
 swig_add_library(FunctionSwig TYPE SHARED LANGUAGE python SOURCES Function.i)
-set_target_properties(FunctionSwig PROPERTIES SUFFIX ".so" )
+set_target_properties(FunctionSwig PROPERTIES SUFFIX ".so" OUTPUT_NAME "Function")
 target_link_libraries(FunctionSwig PRIVATE ${UW_LIBRARIES} PRIVATE ${PETSc_LIBRARIES} PRIVATE Python3::Module)
 
 set_source_files_properties(c_arrays.i PROPERTIES CPLUSPLUS ON SWIG_MODULE_NAME c_arrays)
 swig_add_library(c_arraysSwig TYPE SHARED LANGUAGE python SOURCES c_arrays.i)
-set_target_properties(c_arraysSwig PROPERTIES SUFFIX ".so")
+set_target_properties(c_arraysSwig PROPERTIES SUFFIX ".so" OUTPUT_NAME "c_arrays")
 target_link_libraries(c_arraysSwig PRIVATE ${UW_LIBRARIES} PRIVATE ${PETSc_LIBRARIES} PRIVATE Python3::Module)
 
 set_source_files_properties(c_pointers.i PROPERTIES CPLUSPLUS ON SWIG_MODULE_NAME c_pointers)
 swig_add_library(c_pointersSwig TYPE SHARED LANGUAGE python SOURCES c_pointers.i)
-set_target_properties(c_pointersSwig PROPERTIES SUFFIX ".so")
+set_target_properties(c_pointersSwig PROPERTIES SUFFIX ".so" OUTPUT_NAME "c_pointers")
 target_link_libraries(c_pointersSwig PRIVATE ${UW_LIBRARIES} PRIVATE ${PETSc_LIBRARIES} PRIVATE Python3::Module)
 
 set_source_files_properties(gLucifer.i PROPERTIES CPLUSPLUS ON SWIG_MODULE_NAME gLucifer)