Skip to content

minor changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2019
Merged

minor changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions source/ports/java_port/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ endif()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/interface")


#
# Create library
#
Expand Down Expand Up @@ -170,6 +171,7 @@ target_include_directories(${SWIG_MODULE_${target}_REAL_NAME}
${CMAKE_CURRENT_BINARY_DIR}/include

${JAVA_INCLUDE_DIRS} # Java includes
${JNI_INCLUDE_DIRS} #jni includes

PUBLIC
${DEFAULT_INCLUDE_DIRECTORIES}
Expand All @@ -187,6 +189,7 @@ target_include_directories(${SWIG_MODULE_${target}_REAL_NAME}
swig_link_libraries(${target}
PRIVATE
${JAVA_LIBRARY} # Java libraries
${JNI_LIBRARIES} # JNI libraries

${META_PROJECT_NAME}::metacall_distributable

Expand Down
5 changes: 2 additions & 3 deletions source/ports/java_port/interface/java_port/java_port.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@

%init
%{
metacall_log_stdio_type log_stdio = { stdout };
struct metacall_log_stdio_type log_stdio;
log_stdio.stream = stdout;

(void)metacall_log(METACALL_LOG_STDIO, (void *)&log_stdio);

Expand All @@ -61,9 +62,7 @@
# define METACALL_API
#endif

%thread;
%include <metacall/metacall.h>
%nothread;

#endif /* SWIG && SWIGJAVA */

Expand Down