Merge pull request #26 from sy-c/master

node.js

Author: sy-c

CMakeLists.txt

@@ -335,34 +335,33 @@ if(SWIG_FOUND)
   endif()  
 
   #library for Javascript / node.js
-  if(NOT APPLE)
-    find_program(NODE_EXECUTABLE node)
-    get_filename_component(NODE_DIR ${NODE_EXECUTABLE} DIRECTORY)
-    find_path(NODEJS_INCLUDE_DIRS NAMES node.h NO_DEFAULT_PATH PATHS ${Nodejs_ROOT} ${Nodejs_ROOT}/include ${NODE_DIR}/../include/node)
-    if (NODEJS_INCLUDE_DIRS)
-      message("Bindings for node.js will be generated")
-      message("Using NODEJS_INCLUDE_DIRS=${NODEJS_INCLUDE_DIRS}")
-      if (${SWIG_VERSION} VERSION_LESS "4.0.0")
-        message("SWIG>=4.0.0 needed to generate node.js wrapper, reusing cached one")
-        set(SWIG_MODULE_infoLoggerForNodejs_REAL_NAME infoLoggerForNodejs)
-        add_library (infoLoggerForNodejs SHARED src/infoLoggerJAVASCRIPT_wrap.cxx ${INFOLOGGER_LIB_OBJECTS})
-        target_include_directories(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PRIVATE ${INFOLOGGER_INCLUDE_DIRS} ${NODEJS_INCLUDE_DIRS})
-        set_target_properties(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PROPERTIES PREFIX "")
-      else()
-        set(CMAKE_SWIG_FLAGS -module infoLoggerForNodejs -v8)
-        swig_add_library(infoLoggerForNodejs LANGUAGE javascript SOURCES src/infoLogger.i  ${INFOLOGGER_LIB_OBJECTS})
-      endif()
+  find_program(NODE_EXECUTABLE node)
+  execute_process(COMMAND ${NODE_EXECUTABLE} --version COMMAND tr -d 'v' OUTPUT_VARIABLE NODEJS_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+  get_filename_component(NODE_DIR ${NODE_EXECUTABLE} DIRECTORY)
+  find_path(NODEJS_INCLUDE_DIRS NAMES node.h NO_DEFAULT_PATH PATHS ${Nodejs_ROOT} ${Nodejs_ROOT}/include ${NODE_DIR}/../include/node)
+  if (NODEJS_INCLUDE_DIRS AND ${NODEJS_VERSION} VERSION_GREATER_EQUAL "8.9")
+    message("Bindings for node.js will be generated")
+    message("Using NODEJS_INCLUDE_DIRS=${NODEJS_INCLUDE_DIRS}")
+    message("Node.js version ${NODEJS_VERSION}")
+    if (${SWIG_VERSION} VERSION_LESS "4.0.0")
+      message("SWIG>=4.0.0 needed to generate node.js wrapper, reusing cached one")
+      set(SWIG_MODULE_infoLoggerForNodejs_REAL_NAME infoLoggerForNodejs)
+      add_library (infoLoggerForNodejs SHARED src/infoLoggerJAVASCRIPT_wrap.cxx ${INFOLOGGER_LIB_OBJECTS})
       target_include_directories(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PRIVATE ${INFOLOGGER_INCLUDE_DIRS} ${NODEJS_INCLUDE_DIRS})
-      target_compile_definitions(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PRIVATE -DBUILDING_NODE_EXTENSION)
-      set_target_properties(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PROPERTIES OUTPUT_NAME infoLogger SUFFIX ".node")
-      set(no_lookup_compilers "Clang" "AppleClang")
-      if ( ${CMAKE_CXX_COMPILER_ID} IN_LIST no_lookup_compilers)
-        set_target_properties(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-      endif()
-      install(TARGETS ${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+      set_target_properties(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PROPERTIES PREFIX "")
+    else()
+      set(CMAKE_SWIG_FLAGS -module infoLoggerForNodejs -v8)
+      swig_add_library(infoLoggerForNodejs LANGUAGE javascript SOURCES src/infoLogger.i  ${INFOLOGGER_LIB_OBJECTS})
     endif()
+    target_include_directories(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PRIVATE ${INFOLOGGER_INCLUDE_DIRS} ${NODEJS_INCLUDE_DIRS})
+    target_compile_definitions(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PRIVATE -DBUILDING_NODE_EXTENSION)
+    set_target_properties(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PROPERTIES OUTPUT_NAME infoLogger SUFFIX ".node")
+    set(no_lookup_compilers "Clang" "AppleClang")
+    if ( ${CMAKE_CXX_COMPILER_ID} IN_LIST no_lookup_compilers)
+      set_target_properties(${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+    endif()
+    install(TARGETS ${SWIG_MODULE_infoLoggerForNodejs_REAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
-  
 endif()
 
 

doc/scriptingAPI.md

@@ -76,6 +76,7 @@ Example usage is shown below. Library files listed there are available from the
 * **Go**
   * Library files: `infoLoggerForGo.a` and `infoLoggerForGo.go`, to be copied to your `${GOPATH}/src/infoLoggerForGo`
   * Build: `CGO_LDFLAGS="${GOPATH}/src/infoLoggerForGo/infoLoggerForGo.a -lstdc++" go build`
+    If the c++ library version used at compile time is not available at runtime, you may include a static version of the lib in the executable by replacing `-lstdc++` with `/full/path/to/libstdc++.a`.
   * Code example: 
     ```
       package main