cmake: fix swig generation and remove javascript as v8 not present on galileo images

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

diff --git a/src/grove/CMakeLists.txt b/src/grove/CMakeLists.txt
index f783527..2c55246 100644 (file)
--- a/src/grove/CMakeLists.txt
+++ b/src/grove/CMakeLists.txt
@@ -3,7 +3,7 @@ add_library (grove SHARED grove.cxx)
 include_directories (${MAA_INCLUDE_DIR})
 target_link_libraries (grove ${MAA_LIBRARIES})
 
-if (DOXYGEN_FOUND AND SWIG_FOUND)
+if (SWIG_FOUND)
   find_package (PythonLibs)
 
   include_directories (
@@ -15,21 +15,25 @@ if (DOXYGEN_FOUND AND SWIG_FOUND)
 
   set_source_files_properties (pyupm_grove.i PROPERTIES CPLUSPLUS ON)
   set_source_files_properties (jsupm_grove.i PROPERTIES CPLUSPLUS ON)
+  set_source_files_properties (jsupm_grove.i PROPERTIES SWIG_FLAGS "-node")
 
   swig_add_module (pyupm_grove python pyupm_grove.i grove.cxx)
-  swig_add_module (jsupm_grove python jsupm_grove.i grove.cxx)
+#  swig_add_module (jsupm_grove javascript jsupm_grove.i grove.cxx)
+
   swig_link_libraries (pyupm_grove ${PYTHON_LIBRARIES} ${MAA_LIBRARIES})
-  swig_link_libraries (jsupm_grove ${PYTHON_LIBRARIES} ${MAA_LIBRARIES})
+#  swig_link_libraries (jsupm_grove ${MAA_LIBRARIES})
 
-  set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
-  add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n
-      ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
-      ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
-      DEPENDS ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
-  )
-  add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i)
-  add_dependencies (${libname}doc_i doc)
-  add_dependencies (${SWIG_MODULE_pyupm_grove_REAL_NAME} ${libname}doc_i)
+  if (DOXYGEN_FOUND)
+    set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
+    add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
+      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n
+        ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
+        ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
+        DEPENDS ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
+    )
+    add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i)
+    add_dependencies (${libname}doc_i doc)
+    add_dependencies (${SWIG_MODULE_pyupm_grove_REAL_NAME} ${libname}doc_i)
+  endif ()
 
 endif ()

diff --git a/src/hmc5883l/CMakeLists.txt b/src/hmc5883l/CMakeLists.txt
index 29bfdae..0ba8a80 100644 (file)
--- a/src/hmc5883l/CMakeLists.txt
+++ b/src/hmc5883l/CMakeLists.txt
@@ -3,7 +3,7 @@ add_library (hmc5883l SHARED hmc5883l.cxx)
 include_directories (${MAA_INCLUDE_DIR})
 target_link_libraries (hmc5883l ${MAA_LIBRARIES})
 
-if (DOXYGEN_FOUND AND SWIG_FOUND)
+if (SWIG_FOUND)
   find_package (PythonLibs)
 
   include_directories (
@@ -15,21 +15,25 @@ if (DOXYGEN_FOUND AND SWIG_FOUND)
 
   set_source_files_properties (pyupm_hmc5883l.i PROPERTIES CPLUSPLUS ON)
   set_source_files_properties (jsupm_hmc5883l.i PROPERTIES CPLUSPLUS ON)
+  set_source_files_properties (jsupm_hmc5883l.i PROPERTIES SWIG_FLAGS "-node")
 
   swig_add_module (pyupm_hmc5883l python pyupm_hmc5883l.i hmc5883l.cxx)
-  swig_add_module (jsupm_hmc5883l python jsupm_hmc5883l.i hmc5883l.cxx)
+#  swig_add_module (jsupm_hmc5883l javascript jsupm_hmc5883l.i hmc5883l.cxx)
+
   swig_link_libraries (pyupm_hmc5883l ${PYTHON_LIBRARIES} ${MAA_LIBRARIES})
-  swig_link_libraries (jsupm_hmc5883l ${PYTHON_LIBRARIES} ${MAA_LIBRARIES})
+#  swig_link_libraries (jsupm_hmc5883l ${MAA_LIBRARIES})
 
-  set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
-  add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n
-      ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
-      ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
-      DEPENDS ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
-  )
-  add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i)
-  add_dependencies (${libname}doc_i doc)
-  add_dependencies (${SWIG_MODULE_pyupm_hmc5883l_REAL_NAME} ${libname}doc_i)
+  if (DOXYGEN_FOUND)
+    set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
+    add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
+      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n
+        ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
+        ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
+        DEPENDS ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
+    )
+    add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i)
+    add_dependencies (${libname}doc_i doc)
+    add_dependencies (${SWIG_MODULE_pyupm_hmc5883l_REAL_NAME} ${libname}doc_i)
+  endif ()
 
 endif ()