From 3772c807b4057b3ea9cfb049f618fdee4de772cf Mon Sep 17 00:00:00 2001
From: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Date: Wed, 20 May 2015 12:07:48 -0700
Subject: [PATCH] jsdoc: added target for node.js documentation and minor fixes
 to modules

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 CMakeLists.txt                                     | 13 +++++++------
 cmake/modules/{FindNodejs.cmake => FindNode.cmake} |  0
 cmake/modules/FindYuidoc.cmake                     |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename cmake/modules/{FindNodejs.cmake => FindNode.cmake} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a402bff5..efbfc554 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ message (INFO " found libmraa version: ${MRAA_VERSION}")
 # Appends the cmake/modules path to MAKE_MODULE_PATH variable.
 set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries")
+set (NODE_PATH "/usr/local/lib/node_modules" CACHE PATH "Path to node modules")
 
 # Set CMAKE_LIB_INSTALL_DIR if not defined
 include(GNUInstallDirs)
@@ -104,17 +105,17 @@ if (BUILDDOC)
   find_package(Yuidoc)
   if(YUIDOC_FOUND)
     # node required for Yuidoc documentation
-	find_package(node)
-    set(NODE_PATH "/usr/local/lib/node_modules" CACHE PATH "Path to node modules")
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxy/node ${CMAKE_CURRENT_BINARY_DIR})
+	find_package(Node)
+	file(GLOB JSDOC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/doxy/node/*)
+	file(COPY ${JSDOC_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 	add_custom_target(jsdoc
-	  ${NODE_EXECUTABLE} docgen -m upm -i xml
+	  NODE_PATH=${NODE_PATH} ${NODE_EXECUTABLE} docgen -m upm -i xml
 	  COMMAND ${YUIDOC_EXECUTABLE} -C --no-sort --config generators/yuidoc/conf.json -o html/node jsdoc/yuidoc/upm
-	  COMMAND ${NODE_EXECUTABLE} tolower -i html/node
+	  COMMAND NODE_PATH=${NODE_PATH} ${NODE_EXECUTABLE} tolower -i html/node
+	  DEPENDS doc
 	  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
       COMMENT "Generating API documentation with Yuidoc" VERBATIM
 	)
-	add_dependencies(jsdoc doc)
   endif()
 endif()
 
diff --git a/cmake/modules/FindNodejs.cmake b/cmake/modules/FindNode.cmake
similarity index 100%
rename from cmake/modules/FindNodejs.cmake
rename to cmake/modules/FindNode.cmake
diff --git a/cmake/modules/FindYuidoc.cmake b/cmake/modules/FindYuidoc.cmake
index 1e946b21..cf1a6a0b 100644
--- a/cmake/modules/FindYuidoc.cmake
+++ b/cmake/modules/FindYuidoc.cmake
@@ -1,5 +1,6 @@
 find_program (YUIDOC_EXECUTABLE NAMES yuidoc
     HINTS $ENV{YUIDOC_DIR}
+	PATHS usr usr/local
     PATH_SUFFIXES bin
     DOC "Yuidoc documentation generator"
 )
@@ -13,9 +14,8 @@ find_package_handle_standard_args (Yuidoc DEFAULT_MSG
 # Get Yuidoc version
 if (YUIDOC_EXECUTABLE)
     execute_process(COMMAND ${YUIDOC_EXECUTABLE} --version
-                    OUTPUT_VARIABLE YUIDOC_VERSION)
-    string(REGEX MATCH "([0-9]\\.[0-9]\\.[0-9])" YUIDOC_VERSION_STR ${YUIDOC_VERSION})
-    message ("INFO - Yuidoc version is " ${YUIDOC_VERSION_STR})
+                    ERROR_VARIABLE YUIDOC_VERSION)
+    message ("INFO - Yuidoc version is " ${YUIDOC_VERSION})
 endif ()
 
 mark_as_advanced (YUIDOC_EXECUTABLE)