Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
Showing
4 changed files
with
40 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters