From 0633cd41459c8af43594a1801619b12bcefa14ae Mon Sep 17 00:00:00 2001 From: Henry Bruce Date: Thu, 25 Feb 2016 13:22:47 -0800 Subject: [PATCH] javascript: Updated cmake so that mraa.node dynamically links to libmraa mraa.node was statically linking to mraa object files causing duplicate mraa platform instances if a upm node.js module was also loaded. Signed-off-by: Henry Bruce Signed-off-by: Brendan Le Foll --- src/javascript/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt index 7885dad..b0cd93b 100644 --- a/src/javascript/CMakeLists.txt +++ b/src/javascript/CMakeLists.txt @@ -21,8 +21,8 @@ set_property (SOURCE mraajs.i PROPERTY SWIG_FLAGS "-node" "-I${CMAKE_BINARY_DIR}/src" "-DV8_VERSION=${V8_VERSION_HEX}") set_source_files_properties (mraajs.i PROPERTIES CPLUSPLUS ON) -swig_add_module (mraajs javascript mraajs.i ${mraa_LIB_SRCS}) -swig_link_libraries (mraajs ${mraa_LIBS}) +swig_add_module (mraajs javascript mraajs.i) +swig_link_libraries (mraajs mraa) set_target_properties (mraajs PROPERTIES COMPILE_FLAGS " -DBUILDING_NODE_EXTENSION -DSWIGJAVASCRIPT=${SWIG_FOUND}"