diff options
Diffstat (limited to 'examples/api/java/CMakeLists.txt')
| -rw-r--r-- | examples/api/java/CMakeLists.txt | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/examples/api/java/CMakeLists.txt b/examples/api/java/CMakeLists.txt index 76a55151e..2b364c3d1 100644 --- a/examples/api/java/CMakeLists.txt +++ b/examples/api/java/CMakeLists.txt @@ -1,6 +1,3 @@ -set(EXAMPLES_API_JAVA_BIN_DIR ${EXAMPLES_BIN_DIR}/api/java) -file(MAKE_DIRECTORY ${EXAMPLES_API_JAVA_BIN_DIR}) - set(EXAMPLES_API_JAVA BitVectors BitVectorsAndArrays @@ -8,29 +5,30 @@ set(EXAMPLES_API_JAVA #CVC4Streams Combination Datatypes + FloatingPointArith HelloWorld LinearArith ## disabled until bindings for the new API are in place (issue #2284) #PipedInput + Statistics Strings + UnsatCores ) foreach(example ${EXAMPLES_API_JAVA}) - add_custom_target(${example} - COMMAND - ${Java_JAVAC_EXECUTABLE} - -cp ${EXAMPLES_JAVA_CLASSPATH} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java - -d ${EXAMPLES_API_JAVA_BIN_DIR} - DEPENDS cvc4jar) - add_dependencies(examples ${example}) - set(example_test example/api/java/${example}) + add_jar(${example} ${example}.java + INCLUDE_JARS "${CVC4_JAR}" + OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin/api/java") + + set(EXAMPLE_TEST_NAME api/java/${example}) + add_test( - NAME ${example_test} + NAME ${EXAMPLE_TEST_NAME} COMMAND ${Java_JAVA_EXECUTABLE} - -Djava.library.path=${CMAKE_BINARY_DIR}/src/bindings/java/ - -cp "${EXAMPLES_JAVA_CLASSPATH}:${CMAKE_BINARY_DIR}/bin/examples/api/java/" + -cp "${CVC4_JAR}:${CMAKE_BINARY_DIR}/bin/api/java/${example}.jar" + -Djava.library.path=${CVC4_JNI_PATH} ${example} ) - set_tests_properties(${example_test} PROPERTIES LABELS "example") + set_tests_properties(${EXAMPLE_TEST_NAME} PROPERTIES SKIP_RETURN_CODE 77) endforeach() |