doxygen: generic and more reliable doxygen/swig autodoc integration

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

CMakeLists.txt

@@ -33,10 +33,6 @@ set (maa_VERSION_MINOR ${VERSION_MINOR})
 set (maa_VERSION_PATCH ${VERSION_PATCH})
 set (maa_VERSION_STRING ${maa_VERSION_MAJOR}.${maa_VERSION_MINOR}.${maa_VERSION_PATCH})
 
-set (SWIG_EXECUTABLE /usr/bin/swig)
-find_package (SWIG REQUIRED)
-include (${SWIG_USE_FILE})
-
 set (CMAKE_SWIG_FLAGS "")
 
 option (test "Build all tests." OFF)

src/CMakeLists.txt

@@ -48,5 +48,25 @@ maa_create_install_pkgconfig(maa.pc lib${LIB_SUFFIX}/pkgconfig)
 
 install (TARGETS maa DESTINATION lib)
 
+if (DOXYGEN_FOUND)
+  set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
+  set (DOCFILES maa pwm i2c gpio)
+  foreach (_file ${DOCFILES})
+    add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}_doc.i
+      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/doxy2swig.py -n
+        ${CMAKE_BINARY_DIR}/xml/${_file}_8h.xml
+        ${CMAKE_CURRENT_BINARY_DIR}/${_file}_doc.i
+      DEPENDS ${CMAKE_BINARY_DIR}/xml/${_file}_8h.xml
+    )
+    add_custom_target (${_file}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}_doc.i)
+    add_dependencies (${_file}doc_i doc)
+  endforeach ()
+endif ()
+
+find_package (SWIG)
+if (SWIG_FOUND)
+  include (${SWIG_USE_FILE})
+
   add_subdirectory (python)
   add_subdirectory (javascript)
+endif ()

src/javascript/CMakeLists.txt

@@ -1,4 +1,4 @@
-FIND_PATH(NODE_ROOT_DIR "node/node.h")
+find_path (NODE_ROOT_DIR "node/node.h")
 
 set (NODE_INCLUDE_DIRS
   ${NODE_ROOT_DIR}/src 
@@ -13,11 +13,17 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
-SET_SOURCE_FILES_PROPERTIES(maajs.i PROPERTIES SWIG_FLAGS "-node")
-SET_SOURCE_FILES_PROPERTIES(maajs.i PROPERTIES CPLUSPLUS ON)
+set_source_files_properties (maajs.i PROPERTIES SWIG_FLAGS "-node")
+set_source_files_properties (maajs.i PROPERTIES CPLUSPLUS ON)
 
-SWIG_ADD_MODULE(maajs javascript maajs.i ${maa_LIB_SRCS})
-SWIG_LINK_LIBRARIES(maajs ${NODE_LIBRARIES})
+swig_add_module (maajs javascript maajs.i ${maa_LIB_SRCS})
+swig_link_libraries (maajs ${NODE_LIBRARIES})
+
+if (DOXYGEN_FOUND)
+  foreach (_file ${DOCFILES})
+    add_dependencies (${SWIG_MODULE_maajs_REAL_NAME} ${_file}doc_i)
+  endforeach ()
+endif ()
 
 set_target_properties (maajs PROPERTIES
   PREFIX ""

src/javascript/maajs.i

@@ -1,8 +1,19 @@
-%module maajs
+%module (docstring="Javascript interface to libmaa") maajs
 %{
     #include "maa.h"
 %}
 
 %include <node.i>
 
+%rename("%(strip:[maa_])s") "";
+
+%feature("autodoc", "1");
+
+#ifdef DOXYGEN
+%include ../maa_doc.i
+%include ../gpio_doc.i
+%include ../i2c_doc.i
+%include ../pwm_doc.i
+#endif
+
 %include ../maa.i

src/python/CMakeLists.txt

@@ -6,24 +6,11 @@ include_directories(
   ${PYTHON_INCLUDE_DIRS}
 )
 
-if (DOXYGEN_FOUND)
-  set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
-endif ()
-
 swig_add_module (pymaa python pymaa.i ${maa_LIB_SRCS})
 swig_link_libraries (pymaa ${PYTHON_LIBRARIES})
 
 if (DOXYGEN_FOUND)
-  set (DOCFILES maa pwm i2c gpio)
   foreach (_file ${DOCFILES})
-    add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}_doc.i
-      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/doxy2swig.py -n
-        ${CMAKE_BINARY_DIR}/xml/${_file}_8h.xml
-        ${CMAKE_CURRENT_BINARY_DIR}/${_file}_doc.i
-      DEPENDS ${CMAKE_BINARY_DIR}/xml/${_file}_8h.xml
-    )
-
-    add_custom_target (${_file}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}_doc.i)
     add_dependencies (${SWIG_MODULE_pymaa_REAL_NAME} ${_file}doc_i)
   endforeach ()
 

src/python/pymaa.i

@@ -5,10 +5,10 @@
 %feature("autodoc", "1");
 
 #ifdef DOXYGEN
-%include maa_doc.i
-%include gpio_doc.i
-%include i2c_doc.i
-%include pwm_doc.i
+%include ../maa_doc.i
+%include ../gpio_doc.i
+%include ../i2c_doc.i
+%include ../pwm_doc.i
 #endif
 
 %include ../maa.i