Skip to content

Commit

Permalink
Get rid of more Modular stuff that was left
Browse files Browse the repository at this point in the history
  • Loading branch information
lisitsyn authored and vigsterkr committed Jun 30, 2017
1 parent c054d9c commit 3f450d4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmake/FindScala.cmake
Expand Up @@ -14,7 +14,7 @@ find_package(Java COMPONENTS Runtime)
if(JAVA_FOUND)
include(UseJava)
else()
message(WARNING "JAVA count not be found!" "\nIt is required for Scala Modular Interface!!!")
message(WARNING "Java is not found." "\nIt is required for the Scala Interface.")
endif()

find_program(Scala_SCALA_EXECUTABLE
Expand Down
10 changes: 5 additions & 5 deletions examples/meta/CMakeLists.txt
Expand Up @@ -27,7 +27,7 @@ LIST(APPEND GENERATOR_DEPENDENCIES ${TARGET_LANGUAGES})
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/parser_files)

# list of interfaces for which we dont generate meta examples
SET(DISABLED_INTERFACES PerlModular)
SET(DISABLED_INTERFACES Perl)

FOREACH(META_EXAMPLE ${META_EXAMPLES})
# assume a structure <target_language>/<category>/listing.sg
Expand All @@ -40,15 +40,15 @@ FOREACH(META_EXAMPLE ${META_EXAMPLES})
# FIXME
# Hack to avoid generation of scala meta examples dependencies that will
# not be generated by generate.py script (since there is no scala.json)
LIST(REMOVE_ITEM AVAILABLE_INTERFACES "ScalaModular")
LIST(REMOVE_ITEM AVAILABLE_INTERFACES "Scala")
FOREACH(interface ${AVAILABLE_INTERFACES})
list(FIND DISABLED_INTERFACES ${interface} disabled)
if (${disabled} STREQUAL "-1")
GET_INTERFACE_VARS(${interface} DIRECTORY EXTENSION)
LIST(APPEND EXAMPLE_LISTINGS ${CMAKE_CURRENT_BINARY_DIR}/${DIRECTORY}/${BASENAME}.${EXTENSION})
endif()
ENDFOREACH()
LIST(APPEND AVAILABLE_INTERFACES "ScalaModular")
LIST(APPEND AVAILABLE_INTERFACES "Scala")

# Set generate.py flags
SET(GENERATOR_FLAGS
Expand Down Expand Up @@ -104,11 +104,11 @@ ENDIF()
# FIXME: these are the interfaces which has various problems
# hence need to disable their testing
# temporarily disabled as R and static calls has to be fixed
LIST(APPEND DISABLED_INTERFACES RModular)
LIST(APPEND DISABLED_INTERFACES R)
# temporarily removed since lua modular currently
# does not support overloaded c++ methods
# see https://github.com/shogun-toolbox/shogun/issues/3018
LIST(APPEND DISABLED_INTERFACES LuaModular)
LIST(APPEND DISABLED_INTERFACES Lua)


FOREACH(interface ${AVAILABLE_INTERFACES})
Expand Down

0 comments on commit 3f450d4

Please sign in to comment.