From eb5a3ac5d24eb92a3eafdf632d1bc334bc6e8f17 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Tue, 11 Aug 2015 11:36:38 +0100 Subject: [PATCH] cmake: add ${mraa_LIBS} to linker for swig libraries This means that the correct libraries are added when mraa_LIBS is appended, fixes ft4222 handling with SWIG APIs Signed-off-by: Brendan Le Foll --- src/java/CMakeLists.txt | 2 +- src/javascript/CMakeLists.txt | 2 +- src/python/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt index 34c348d..d729897 100644 --- a/src/java/CMakeLists.txt +++ b/src/java/CMakeLists.txt @@ -16,7 +16,7 @@ set (JAVAC $ENV{JAVA_HOME}/bin/javac) set (JAR $ENV{JAVA_HOME}/bin/jar) swig_add_module (mraajava java mraajava.i ${mraa_LIB_SRCS}) -swig_link_libraries (mraajava ${JAVA_LIBRARIES}) +swig_link_libraries (mraajava ${JAVA_LIBRARIES} ${mraa_LIBS}) add_custom_command (TARGET mraajava POST_BUILD diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt index e06e1f5..4b33ebb 100644 --- a/src/javascript/CMakeLists.txt +++ b/src/javascript/CMakeLists.txt @@ -15,7 +15,7 @@ set_property (SOURCE mraajs.i PROPERTY SWIG_FLAGS "-node" set_source_files_properties (mraajs.i PROPERTIES CPLUSPLUS ON) swig_add_module (mraajs javascript mraajs.i ${mraa_LIB_SRCS}) -swig_link_libraries (mraajs ${NODE_LIBRARIES}) +swig_link_libraries (mraajs ${NODE_LIBRARIES} ${mraa_LIBS}) set_target_properties (mraajs PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -DBUILDING_NODE_EXTENSION -DSWIGJAVASCRIPT=${SWIG_FOUND}" diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 9b9fd8e..1d06b82 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories( set_source_files_properties (mraa.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (mraa.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src") swig_add_module (python-mraa python mraa.i ${mraa_LIB_SRCS}) -swig_link_libraries (python-mraa ${PYTHON_LIBRARIES}) +swig_link_libraries (python-mraa ${PYTHON_LIBRARIES} ${mraa_LIBS}) if (DOXYGEN_FOUND) foreach (_file ${DOCCLASSES})