From d045dded7c84a31b7402a5eb14ed6baebb7e2e85 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 29 Apr 2016 11:59:33 -0600 Subject: [PATCH] java: add mraa to the java swig link line so mraa symbols can be found Previously in MRAA, the libmraa library was statically linked into the libmraajava library. This was changed recently in MRAA, causing most java examples to fail due to missing mraa symbols. This patch specifically adds libmraa to the link in addition to libmraajava. In addition, use *_LIBRARIES in the java specific swig_link_libraries call rather than *_LDFLAGS. Signed-off-by: Jon Trulson Signed-off-by: Noel Eck --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff17b4bb..117f25d7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -126,7 +126,7 @@ macro(upm_SWIG_JAVA) set_source_files_properties (javaupm_${libname}.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (javaupm_${libname}.i PROPERTIES SWIG_FLAGS ";-package;upm_${libname};-I${CMAKE_BINARY_DIR}/src") swig_add_module (javaupm_${libname} java javaupm_${libname}.i ${module_src}) - swig_link_libraries (javaupm_${libname} ${MRAAJAVA_LDFLAGS} ${JAVA_LDFLAGS}) + swig_link_libraries (javaupm_${libname} ${MRAAJAVA_LIBRARIES} ${MRAA_LIBRARIES} ${JAVA_LIBRARIES}) target_include_directories ( ${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PUBLIC "${JAVA_INCLUDE_DIRS}"