python: Build both python2 and python3 modules

Updated UPM cmake to build both python2/3 modules if the necessary python libs are available. * Removed BUILDPYTHON3 cmake option in favor of building both versions * Added cmake module to find both python2 and python3 * Added macro which can be called from per-sensor cmake files to add dependency libraries via target_link_libraries as well as swig_link_libraries (for java, nodejs, and python) * Python2 is required for python documentation builds * Cleanup of python usage throughout UPM cmakelists. * Make find_package for Node required. Removed check for NODE_FOUND (which should have been NODEJS_FOUND) in favor of REQUIRED. * The cxx and .py wrapper files get generated in python2/3 (instead of the same directory). It appears these files are identical, however since the targets can be built in parallel it's safer to split them out. * Updated all cmake dependencies related to building documentation. * Removed unused classname from cmake files Signed-off-by: Noel Eck <noel.eck@intel.com>
2025-07-01 17:31:13 +03:00 · 2016-09-29 13:46:20 -07:00
parent f0fa6f7b68
commit 62718daf0b
29 changed files with 438 additions and 226 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -26,28 +26,123 @@ macro (upm_create_install_pkgconfig generated_file install_location)
  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location})
 endmacro(upm_create_install_pkgconfig)

-macro(upm_swig_python)
-  if (BUILDSWIGPYTHON)
+# Provides a means to call target_link_libraries AND the necessary
+# swig_link_libaries.  This iterates over all additional parameters AFTER
+# the target name calling target_link_libraries/swig_link_libraries
+# as necessary accordingly
+macro (upm_target_link_libraries target_name)
+  # For each additional argument to upm_target_link_libraries...
+  foreach(_library ${ARGN})
+    # Add the dependency
+    target_link_libraries(${target_name} ${_library})

-    include_directories (
-      ${CMAKE_CURRENT_SOURCE_DIR}/..
-    )
+    # Call the swig link library method for each library
+    if (BUILDSWIGNODE)
+      set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+      swig_link_libraries (jsupm_${libname} ${_library})
+    endif()
+    # Build python2 AND/OR python3 modules
+    if (BUILDSWIGPYTHON)
+      # python2?
+      if (PYTHON2LIBS_FOUND)
+        set (pymod_target_name pyupm_${target_name}-python${PYTHON2_VERSION_MAJOR})
+        set_target_properties(${SWIG_MODULE_pyupm_${pymod_target_name}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+        swig_link_libraries (${pymod_target_name} ${_library})
+      endif (PYTHON2LIBS_FOUND)
+      if (PYTHON3LIBS_FOUND)
+        set (pymod_target_name pyupm_${target_name}-python${PYTHON3_VERSION_MAJOR})
+        set_target_properties(${SWIG_MODULE_pyupm_${pymod_target_name}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+        swig_link_libraries (${pymod_target_name} ${_library})
+      endif (PYTHON3LIBS_FOUND)
+    endif()
+    if (BUILDSWIGJAVA)
+      set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+      swig_link_libraries (javaupm_${libname} ${_library})
+    endif()
+  endforeach(_library ${ARGN})
+endmacro (upm_target_link_libraries target_name)

-    set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON)
-    set_source_files_properties (pyupm_${libname}.i PROPERTIES SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}/..")
+# Create a single swig target for python
+macro(_upm_swig_python)
+  # Create a target name which includes python version
+  set (pymod_target_name pyupm_${libname}-python${PYTHON_VERSION_MAJOR})

-    swig_add_module (pyupm_${libname} python pyupm_${libname}.i)
-    swig_link_libraries (pyupm_${libname} ${PYTHON_LIBRARIES} ${MRAA_LIBRARIES} ${libname})
-    target_include_directories ( ${SWIG_MODULE_pyupm_${libname}_REAL_NAME}
+  include_directories (${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+  set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON)
+  set_source_files_properties (pyupm_${libname}.i PROPERTIES SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}/..")
+
+  # Set current python binary dir
+  set (CMAKE_CURRENT_PYTHON_BINARY_DIR
+      ${CMAKE_CURRENT_BINARY_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+
+  # Make sure swig places wrapper/.py collateral under python2/3 directory
+  # Do do this, save the original outdir, set a new outdir, then restore at the
+  # end of this macro.
+  set(CMAKE_SWIG_OUTDIR_SAVED ${CMAKE_SWIG_OUTDIR})
+  set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_PYTHON_BINARY_DIR})
+
+  swig_add_module (${pymod_target_name} python pyupm_${libname}.i)
+  swig_link_libraries (${pymod_target_name} ${PYTHON_LIBRARIES} ${MRAA_LIBRARIES} ${libname})
+  target_include_directories (${SWIG_MODULE_${pymod_target_name}_REAL_NAME}
      PUBLIC
      "${PYTHON_INCLUDE_PATH}"
-      "${PYTHON_INCLUDE_DIRS}"
-     )
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_pyupm_${libname}.so
-         ${CMAKE_CURRENT_BINARY_DIR}/pyupm_${libname}.py
-         DESTINATION ${LIB_INSTALL_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/
-         COMPONENT ${libname})
-  endif()
+      "${PYTHON_INCLUDE_DIRS}")
+
+  # Add C++ comments to ALL python modules (requires doc build)
+  if (BUILDDOC)
+    # Python module depends on doxy2swig .i file generated from the monolithic doxygen xml file
+    add_dependencies(${SWIG_MODULE_${pymod_target_name}_REAL_NAME} pyupm_doxy2swig )
+
+    # The pydoc target depends on EACH python module
+    add_dependencies(pydoc ${SWIG_MODULE_${pymod_target_name}_REAL_NAME})
+  endif (BUILDDOC)
+
+  # Python collateral names with be the same for python2/3 w/different library dirs
+  set_target_properties (${SWIG_MODULE_${pymod_target_name}_REAL_NAME} PROPERTIES
+      OUTPUT_NAME _pyupm_${libname}
+      COMPILE_FLAGS "${CMAKE_C_FLAGS}"
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_PYTHON_BINARY_DIR})
+
+  # Install py to per-python version site-packages
+  install (FILES ${CMAKE_SWIG_OUTDIR}/pyupm_${libname}.py
+      DESTINATION ${LIB_INSTALL_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/
+      COMPONENT ${libname})
+
+  # Install python wrapped library with TARGETS to correctly handle RPATH
+  install (TARGETS ${SWIG_MODULE_${pymod_target_name}_REAL_NAME}
+      DESTINATION ${LIB_INSTALL_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/)
+
+  # Restore OUTDIR
+  set(CMAKE_SWIG_OUTDIR ${CMAKE_SWIG_OUTDIR_SAVED})
+endmacro(_upm_swig_python)
+
+# Generate both python2 and python3 modules if possible
+macro(upm_swig_python)
+  # Return if not building python
+  if (NOT BUILDSWIGPYTHON)
+    return ()
+  endif (NOT BUILDSWIGPYTHON)
+
+  # Generate python2 module if python2 libs are available
+  if (PYTHON2LIBS_FOUND)
+    set(PYTHON_INCLUDE_DIRS ${PYTHON2_INCLUDE_DIRS})
+    set(PYTHON_INCLUDE_PATH ${PYTHON2_INCLUDE_PATH})
+    set(PYTHON_LIBRARIES ${PYTHON2_LIBRARIES})
+    set(PYTHON_VERSION_MAJOR ${PYTHON2_VERSION_MAJOR})
+    set(PYTHON_VERSION_MINOR ${PYTHON2_VERSION_MINOR})
+    _upm_swig_python()
+  endif (PYTHON2LIBS_FOUND)
+
+  # Generate python3 module if python3 libs are available
+  if (PYTHON3LIBS_FOUND)
+    set(PYTHON_INCLUDE_DIRS ${PYTHON3_INCLUDE_DIRS})
+    set(PYTHON_INCLUDE_PATH ${PYTHON3_INCLUDE_PATH})
+    set(PYTHON_LIBRARIES ${PYTHON3_LIBRARIES})
+    set(PYTHON_VERSION_MAJOR ${PYTHON3_VERSION_MAJOR})
+    set(PYTHON_VERSION_MINOR ${PYTHON3_VERSION_MINOR})
+    _upm_swig_python()
+  endif (PYTHON3LIBS_FOUND)
 endmacro(upm_swig_python)

 macro(upm_swig_node)
@ -166,59 +261,37 @@ endmacro(upm_swig_java)

 macro(upm_doxygen)
  if (DOXYGEN_FOUND)
-    if(NOT DEFINED classname)
-      set (classname ${libname})
-    endif()
    set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
-    if (BUILDSWIGPYTHON)
-      add_dependencies (_pyupm_${libname} pyupm_doxy2swig)
-      add_dependencies (pydoc _pyupm_${libname})
-    else ()
-      add_dependencies (${libname} doc)
-    endif ()
+    add_dependencies (doc ${libname})
  endif ()
 endmacro(upm_doxygen)

-if (SWIG_FOUND)
-  if (BUILDSWIGPYTHON)
-    if(NOT PYTHONLIBS_FOUND)
-      find_package (PythonInterp ${PYTHONBUILD_VERSION} REQUIRED)
-      find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED)
-      string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING})
-      list (GET PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR)
-      list (GET PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR)
-    endif()
-  endif(BUILDSWIGPYTHON)
-  if (BUILDSWIGNODE)
-    if(NOT NODE_FOUND)
-      find_package(Node)
-    endif()
-    if(SWIG_VERSION VERSION_LESS 3.0.5 AND NODE_VERSION_STRING VERSION_GREATER 0.12)
-      message(WARNING "WARNING - SWIG 3.0.5+ required for building with nodejs 0.12. Current version is ${SWIG_VERSION}")
-    endif()
-    find_path (NODE_ROOT_DIR "include/node/node.h")
-    set (NODE_INCLUDE_DIRS
-      ${NODE_ROOT_DIR}/include/src
-      ${NODE_ROOT_DIR}/include/node
-      ${NODE_ROOT_DIR}/include/deps/v8/include
-      ${NODE_ROOT_DIR}/include/deps/uv/include
-    )
-    macro(createpackagejson)
-      configure_file (${PROJECT_SOURCE_DIR}/src/package.json.in ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
-      # If a CMAKE_INSTALL_PREFIX has NOT been provided, set NODE_MODULE_INSTALL_PATH
-      # base on the NODE_ROOT_DIR.
-      if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-        set (NODE_MODULE_INSTALL_PATH ${NODE_ROOT_DIR}/lib/node_modules/jsupm_${libname}/)
-      # If a CMAKE_INSTALL_PREFIX has been provided, set NODE_MODULE_INSTALL_PATH
-      # relative to the provided install directory.
-      else ()
-        set (NODE_MODULE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/node_modules/jsupm_${libname}/)
-      endif ()
-      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/package.json
-          DESTINATION ${NODE_MODULE_INSTALL_PATH} COMPONENT ${libname})
-    endmacro(createpackagejson)
-  endif(BUILDSWIGNODE)
-endif()
+if (BUILDSWIGNODE)
+  if(SWIG_VERSION VERSION_LESS 3.0.5 AND NODE_VERSION_STRING VERSION_GREATER 0.12)
+    message(WARNING "WARNING - SWIG 3.0.5+ required for building with nodejs 0.12. Current version is ${SWIG_VERSION}")
+  endif()
+  find_path (NODE_ROOT_DIR "include/node/node.h")
+  set (NODE_INCLUDE_DIRS
+    ${NODE_ROOT_DIR}/include/src
+    ${NODE_ROOT_DIR}/include/node
+    ${NODE_ROOT_DIR}/include/deps/v8/include
+    ${NODE_ROOT_DIR}/include/deps/uv/include
+  )
+  macro(createpackagejson)
+    configure_file (${PROJECT_SOURCE_DIR}/src/package.json.in ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
+    # If a CMAKE_INSTALL_PREFIX has NOT been provided, set NODE_MODULE_INSTALL_PATH
+    # base on the NODE_ROOT_DIR.
+    if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+      set (NODE_MODULE_INSTALL_PATH ${NODE_ROOT_DIR}/lib/node_modules/jsupm_${libname}/)
+    # If a CMAKE_INSTALL_PREFIX has been provided, set NODE_MODULE_INSTALL_PATH
+    # relative to the provided install directory.
+    else ()
+      set (NODE_MODULE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/node_modules/jsupm_${libname}/)
+    endif ()
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/package.json
+        DESTINATION ${NODE_MODULE_INSTALL_PATH} COMPONENT ${libname})
+  endmacro(createpackagejson)
+endif(BUILDSWIGNODE)

 # Process C/C++ sensor modules
 # This function pre-processes sensor library input and hands off the
@ -366,22 +439,19 @@ macro(upm_module_init)
 endmacro(upm_module_init)

 # Generate python module documentation from doxygen collateral
-if (BUILDDOC AND BUILDSWIGPYTHON AND SWIG_FOUND)
+if (BUILDDOC AND BUILDSWIGPYTHON)
  # doxy2swig the doxygen output
-  add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pyupm_doxy2swig.i
+  add_custom_target (pyupm_doxy2swig ALL
    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/doxy2swig.py
      ${CMAKE_BINARY_DIR}/xml/index.xml
      ${CMAKE_CURRENT_BINARY_DIR}/pyupm_doxy2swig.i
-    DEPENDS ${CMAKE_BINARY_DIR}/xml/index.xml
-  )
-  add_custom_target (pyupm_doxy2swig DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pyupm_doxy2swig.i)
-  add_dependencies (pyupm_doxy2swig doc)
+      DEPENDS doc)
 # BUILDDOC not set but still building python modules, generate an empty
 # pyupm_doxy2swig.i file (overwriting if necessary)
-elseif (BUILDSWIGPYTHON AND SWIG_FOUND)
+elseif (BUILDSWIGPYTHON)
  message (STATUS "Generating empty ${CMAKE_CURRENT_BINARY_DIR}/pyupm_doxy2swig.i")
  file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/pyupm_doxy2swig.i "// Empty doxy2swig stub")
-endif (BUILDDOC AND BUILDSWIGPYTHON AND SWIG_FOUND)
+endif (BUILDDOC AND BUILDSWIGPYTHON)

 if (MODULE_LIST)
  set(SUBDIRS ${MODULE_LIST})
--- a/src/adafruitms1438/CMakeLists.txt
+++ b/src/adafruitms1438/CMakeLists.txt
@ -6,12 +6,4 @@ set (reqlibname "upm-pca9685")
 include_directories("../pca9685")
 upm_module_init()
 add_dependencies(${libname} pca9685)
-target_link_libraries(${libname} pca9685)
-if (BUILDSWIGNODE)
-  set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-  swig_link_libraries (jsupm_${libname} pca9685)
-endif()
-if (BUILDSWIGPYTHON)
-  set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-  swig_link_libraries (pyupm_${libname} pca9685)
-endif()
+upm_target_link_libraries(${libname} pca9685)
--- a/src/apds9930/pyupm_apds9930.i
+++ b/src/apds9930/pyupm_apds9930.i
@ -1,5 +1,7 @@
 %module pyupm_apds9930
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"

 %feature("autodoc", "3");

--- a/src/bacnetmstp/CMakeLists.txt
+++ b/src/bacnetmstp/CMakeLists.txt
@ -7,14 +7,5 @@ if (BACNET_FOUND)
  set (reqlibname "libbacnet")
  include_directories(${BACNET_INCLUDE_DIRS})
  upm_module_init()
-  target_link_libraries(${libname} ${BACNET_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-  if (BUILDSWIGNODE)
-    swig_link_libraries (jsupm_${libname} ${BACNET_LIBRARIES})
-  endif()
-  if (BUILDSWIGPYTHON)
-    swig_link_libraries (pyupm_${libname} ${BACNET_LIBRARIES})
-  endif()
-  if (BUILDSWIGJAVA)
-    swig_link_libraries (javaupm_${libname} ${BACNET_LIBRARIES})
-  endif()
+  upm_target_link_libraries(${libname} ${BACNET_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 endif ()
--- a/src/ds1808lc/pyupm_ds1808lc.i
+++ b/src/ds1808lc/pyupm_ds1808lc.i
@ -1,5 +1,8 @@
 %module pyupm_ds1808lc
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+

 %feature("autodoc", "3");

--- a/src/ds18b20/pyupm_ds18b20.i
+++ b/src/ds18b20/pyupm_ds18b20.i
@ -1,5 +1,8 @@
 %module pyupm_ds18b20
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+
 %include "carrays.i"
 %include "std_string.i"

--- a/src/ds2413/pyupm_ds2413.i
+++ b/src/ds2413/pyupm_ds2413.i
@ -1,5 +1,8 @@
 %module pyupm_ds2413
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+
 %include "carrays.i"
 %include "std_string.i"

--- a/src/e50hx/CMakeLists.txt
+++ b/src/e50hx/CMakeLists.txt
@ -9,17 +9,5 @@ if (BACNET_FOUND)
  include_directories(${BACNET_INCLUDE_DIRS})
  include_directories("../bacnetmstp")
  upm_module_init()
-  target_link_libraries(${libname} bacnetmstp)
-  if (BUILDSWIGNODE)
-    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (jsupm_${libname} bacnetmstp)
-  endif()
-  if (BUILDSWIGPYTHON)
-    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (pyupm_${libname} bacnetmstp)
-  endif()
-  if (BUILDSWIGJAVA)
-    set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (javaupm_${libname} bacnetmstp)
-  endif()
+  upm_target_link_libraries(${libname} bacnetmstp)
 endif ()
--- a/src/h803x/CMakeLists.txt
+++ b/src/h803x/CMakeLists.txt
@ -7,14 +7,5 @@ if (MODBUS_FOUND)
  set (reqlibname "libmodbus")
  include_directories(${MODBUS_INCLUDE_DIRS})
  upm_module_init()
-  target_link_libraries(${libname} ${MODBUS_LIBRARIES})
-  if (BUILDSWIGNODE)
-    swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
-  endif()
-  if (BUILDSWIGPYTHON)
-    swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
-  endif()
-  if (BUILDSWIGJAVA)
-    swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
-  endif()
+  upm_target_link_libraries(${libname} ${MODBUS_LIBRARIES})
 endif ()
--- a/src/hlg150h/pyupm_hlg150h.i
+++ b/src/hlg150h/pyupm_hlg150h.i
@ -1,5 +1,7 @@
 %module pyupm_hlg150h
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"

 %feature("autodoc", "3");

--- a/src/hwxpxx/CMakeLists.txt
+++ b/src/hwxpxx/CMakeLists.txt
@ -7,11 +7,5 @@ if (MODBUS_FOUND)
  set (reqlibname "libmodbus")
  include_directories(${MODBUS_INCLUDE_DIRS})
  upm_module_init()
-  target_link_libraries(${libname} ${MODBUS_LIBRARIES})
-  if (BUILDSWIGNODE)
-    swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
-  endif()
-  if (BUILDSWIGPYTHON)
-    swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
-  endif()
+  upm_target_link_libraries(${libname} ${MODBUS_LIBRARIES})
 endif ()
--- a/src/kxcjk1013/pyupm_kxcjk1013.i
+++ b/src/kxcjk1013/pyupm_kxcjk1013.i
@ -1,5 +1,8 @@
 %module pyupm_kxcjk1013
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+

 %feature("autodoc", "3");

--- a/src/l3gd20/pyupm_l3gd20.i
+++ b/src/l3gd20/pyupm_l3gd20.i
@ -1,4 +1,7 @@
 %module pyupm_l3gd20
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+
 %include "../upm.i"

 %feature("autodoc", "3");
--- a/src/lcd/CMakeLists.txt
+++ b/src/lcd/CMakeLists.txt
@ -1,5 +1,4 @@
 set (libname "i2clcd")
-set (classname "lcd")
 set (libdescription "upm lcd/oled displays")
 set (module_src lcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx eboled.cxx ssd1327.cxx sainsmartks.cxx ssd1306.cxx)
 set (module_hpp lcd.hpp lcm1602.hpp jhd1313m1.hpp ssd1308.hpp eboled.hpp ssd1327.hpp ssd.hpp sainsmartks.hpp ssd1306.hpp)
--- a/src/lp8860/pyupm_lp8860.i
+++ b/src/lp8860/pyupm_lp8860.i
@ -1,5 +1,7 @@
 %module pyupm_lp8860
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"

 %feature("autodoc", "3");

--- a/src/max44009/pyupm_max44009.i
+++ b/src/max44009/pyupm_max44009.i
@ -1,5 +1,8 @@
 %module pyupm_max44009
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+

 %include "stdint.i"

--- a/src/ms5611/pyupm_ms5611.i
+++ b/src/ms5611/pyupm_ms5611.i
@ -1,5 +1,7 @@
 %module pyupm_ms5611
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"

 %feature("autodoc", "3");

--- a/src/ozw/CMakeLists.txt
+++ b/src/ozw/CMakeLists.txt
@ -7,17 +7,5 @@ if (OPENZWAVE_FOUND)
  set (reqlibname "libopenzwave")
  include_directories(${OPENZWAVE_INCLUDE_DIRS})
  upm_module_init()
-  target_link_libraries(${libname} ${OPENZWAVE_LIBRARIES})
-  if (BUILDSWIGNODE)
-    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (jsupm_${libname} ${OPENZWAVE_LIBRARIES})
-  endif()
-  if (BUILDSWIGPYTHON)
-    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (pyupm_${libname} ${OPENZWAVE_LIBRARIES})
-  endif()
-  if (BUILDSWIGJAVA)
-    set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (javaupm_${libname} ${OPENZWAVE_LIBRARIES})
-  endif()
+  upm_target_link_libraries(${libname} ${OPENZWAVE_LIBRARIES})
 endif ()
--- a/src/si1132/pyupm_si1132.i
+++ b/src/si1132/pyupm_si1132.i
@ -1,5 +1,8 @@
 %module pyupm_si1132
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+

 %include "stdint.i"

--- a/src/si7005/pyupm_si7005.i
+++ b/src/si7005/pyupm_si7005.i
@ -1,5 +1,8 @@
 %module pyupm_si7005
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+

 %include "stdint.i"

--- a/src/smartdrive/pyupm_smartdrive.i
+++ b/src/smartdrive/pyupm_smartdrive.i
@ -1,5 +1,8 @@
 %module pyupm_smartdrive
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+

 %include "stdint.i"

--- a/src/t3311/CMakeLists.txt
+++ b/src/t3311/CMakeLists.txt
@ -7,14 +7,5 @@ if (MODBUS_FOUND)
  set (reqlibname "libmodbus")
  include_directories(${MODBUS_INCLUDE_DIRS})
  upm_module_init()
-  target_link_libraries(${libname} ${MODBUS_LIBRARIES})
-  if (BUILDSWIGNODE)
-    swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
-  endif()
-  if (BUILDSWIGPYTHON)
-    swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
-  endif()
-  if (BUILDSWIGJAVA)
-    swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
-  endif()
+  upm_target_link_libraries(${libname} ${MODBUS_LIBRARIES})
 endif ()
--- a/src/t6713/pyupm_t6713.i
+++ b/src/t6713/pyupm_t6713.i
@ -1,5 +1,8 @@
 %module pyupm_t6713
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"
+
 %include "stdint.i"

 %feature("autodoc", "3");
--- a/src/t8100/CMakeLists.txt
+++ b/src/t8100/CMakeLists.txt
@ -9,17 +9,5 @@ if (BACNET_FOUND)
  include_directories(${BACNET_INCLUDE_DIRS})
  include_directories("../bacnetmstp")
  upm_module_init()
-  target_link_libraries(${libname} bacnetmstp)
-  if (BUILDSWIGNODE)
-    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (jsupm_${libname} bacnetmstp)
-  endif()
-  if (BUILDSWIGPYTHON)
-    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (pyupm_${libname} bacnetmstp)
-  endif()
-  if (BUILDSWIGJAVA)
-    set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (javaupm_${libname} bacnetmstp)
-  endif()
+  upm_target_link_libraries(${libname} bacnetmstp)
 endif ()
--- a/src/tb7300/CMakeLists.txt
+++ b/src/tb7300/CMakeLists.txt
@ -9,17 +9,5 @@ if (BACNET_FOUND)
  include_directories(${BACNET_INCLUDE_DIRS})
  include_directories("../bacnetmstp")
  upm_module_init()
-  target_link_libraries(${libname} bacnetmstp)
-  if (BUILDSWIGNODE)
-    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (jsupm_${libname} bacnetmstp)
-  endif()
-  if (BUILDSWIGPYTHON)
-    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (pyupm_${libname} bacnetmstp)
-  endif()
-  if (BUILDSWIGJAVA)
-    set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (javaupm_${libname} bacnetmstp)
-  endif()
+  upm_target_link_libraries(${libname} bacnetmstp)
 endif ()
--- a/src/upm/pyupm_interfaces.i
+++ b/src/upm/pyupm_interfaces.i
@ -1,5 +1,7 @@
 %module pyupm_interfaces
 %include "../upm.i"
+// Include doxygen-generated documentation
+%include "pyupm_doxy2swig.i"

 %feature("autodoc", "3");

--- a/src/vcap/CMakeLists.txt
+++ b/src/vcap/CMakeLists.txt
@ -6,14 +6,5 @@ set (module_hpp ${libname}.hpp)
 if (JPEG_FOUND)
    set (reqlibname "jpeg")
    upm_module_init()
-    target_link_libraries(${libname} jpeg)
-    if (BUILDSWIGNODE)
-      swig_link_libraries (jsupm_${libname} jpeg)
-    endif()
-    if (BUILDSWIGPYTHON)
-      swig_link_libraries (pyupm_${libname} jpeg)
-    endif()
-    if (BUILDSWIGJAVA)
-      swig_link_libraries (javaupm_${libname} jpeg)
-    endif()
+    upm_target_link_libraries(${libname} jpeg)
 endif()