Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1809 from shogun-toolbox/feature/fix-java_modular
fix build of java_modular with OpenJDK
  • Loading branch information
vigsterkr committed Jan 7, 2014
2 parents 8679dbf + e699ddb commit cbf1553
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 27 deletions.
44 changes: 22 additions & 22 deletions examples/CMakeLists.txt
@@ -1,51 +1,51 @@
IF (NOT TRAVIS_DISABLE_LIBSHOGUN_TESTS AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/libshogun)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/libshogun)
IF (NOT TRAVIS_DISABLE_LIBSHOGUN_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/libshogun)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/libshogun)
ENDIF()

IF (PythonModular AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/python_modular)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/python_modular)
IF (PythonModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/python_modular)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/python_modular)
ENDIF()

# lua modular
IF (LuaModular AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/lua_modular)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/lua_modular)
IF (LuaModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/lua_modular)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/lua_modular)
ENDIF()

# java modular
IF (JavaModular AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/java_modular)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/java_modular)
IF (JavaModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/java_modular)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/java_modular)
ENDIF()

# ruby modular
IF (RubyModular AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/ruby_modular)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/ruby_modular)
IF (RubyModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/ruby_modular)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/ruby_modular)
ENDIF()

# octave modular
IF (OctaveModular AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/octave_modular)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/octave_modular)
IF (OctaveModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/octave_modular)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/octave_modular)
ENDIF()

# csharp modular
IF (CSharpModular AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/csharp_modular)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/csharp_modular)
IF (CSharpModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/csharp_modular)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/csharp_modular)
ENDIF()

# r modular
IF (RModular AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/r_modular)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/r_modular)
IF (RModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/r_modular)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/r_modular)
ENDIF()

# perl modular
IF (PerlModular AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/perl_modular)
#add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/perl_modular)
IF (PerlModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/perl_modular)
#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/perl_modular)
ENDIF()

IF (MatlabStatic AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/matlab_static)
#add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/matlab_static)
IF (MatlabStatic AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/matlab_static)
#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/matlab_static)
ENDIF()

IF (CmdLineStatic AND EXISTS ${CMAKE_SOURCE_DIR}/undocumented/cmdline_static)
add_subdirectory(${CMAKE_SOURCE_DIR}/undocumented/cmdline_static)
IF (CmdLineStatic AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/undocumented/cmdline_static)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/undocumented/cmdline_static)
ENDIF()

6 changes: 3 additions & 3 deletions examples/undocumented/java_modular/CMakeLists.txt
Expand Up @@ -8,15 +8,15 @@ SET(JAVA_LIB_PATH "${JAVA_MODULAR_BUILD_DIR}")
ADD_CUSTOM_COMMAND(OUTPUT Load.class
COMMAND ${Java_JAVAC_EXECUTABLE} -cp ${CLASSPATH}
-d ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Load.java
DEPENDS shogun_jar)
DEPENDS java_modular)

FOREACH(EXAMPLE_SRC ${EXAMPLES_SRC})
get_filename_component(EXAMPLE_NAME ${EXAMPLE_SRC} NAME_WE)

ADD_CUSTOM_COMMAND(OUTPUT ${EXAMPLE_NAME}.class
COMMAND ${Java_JAVAC_EXECUTABLE} -cp ${CLASSPATH}
-d ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE_SRC}
DEPENDS shogun_jar Load.class)
DEPENDS java_modular Load.class)
LIST(APPEND JAVA_EXAMPLES ${EXAMPLE_NAME}.class)

add_test(NAME java_modular-${EXAMPLE_NAME}
Expand All @@ -28,4 +28,4 @@ ENDFOREACH()

add_custom_target(build_java_examples ALL
DEPENDS Load.class ${JAVA_EXAMPLES}
COMMENT "Java examples")
COMMENT "Java examples")
Binary file not shown.
17 changes: 15 additions & 2 deletions src/interfaces/java_modular/CMakeLists.txt
Expand Up @@ -5,8 +5,21 @@ GENERATE_MODULAR_TARGET(java ${CMAKE_CURRENT_SOURCE_DIR} "")

set(CMAKE_JAVA_TARGET_OUTPUT_NAME shogun)
SET(CMAKE_JAVA_INCLUDE_PATH ${JBLAS})
ADD_JAR(shogun_jar ${CMAKE_CURRENT_BINARY_DIR}/*.java)
add_dependencies(shogun_jar java_modular)

ADD_CUSTOM_COMMAND(TARGET java_modular POST_BUILD
COMMAND cmake -E echo "Compiling Java files..."
COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/shogun_jar
COMMAND ${Java_JAVAC_EXECUTABLE} *.java
-d ${CMAKE_CURRENT_BINARY_DIR}/shogun_jar
-cp "${CMAKE_JAVA_INCLUDE_PATH}"
COMMAND cmake -E echo "Creating jar file..."
COMMAND ${Java_JAR_EXECUTABLE} cvf shogun.jar
-C ${CMAKE_CURRENT_BINARY_DIR}/shogun_jar org
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})


#ADD_JAR(shogun_jar "${CMAKE_CURRENT_BINARY_DIR}/*.java")
#add_dependencies(shogun_jar java_modular)

SET(JAVA_MODULAR_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
INSTALL(TARGETS java_modular
Expand Down

0 comments on commit cbf1553

Please sign in to comment.