diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-09-01 01:59:57 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-09-01 01:59:57 (GMT) |
| commit | e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92 (patch) | |
| tree | fa38a912d34f802629cecab41bae61a2a7d5d1c0 /java | |
| parent | d0a62ef975b1ff52e872ae260de82a42d0fd9fca (diff) | |
| download | hdf5-e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92.zip hdf5-e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92.tar.gz hdf5-e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92.tar.bz2 | |
HDFFV-10568 fix hdf5_java library dependency
Diffstat (limited to 'java')
| -rw-r--r-- | java/examples/datasets/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/examples/datatypes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/examples/groups/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/examples/intro/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/test/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt index 1b43d00..1375372 100644 --- a/java/examples/datasets/CMakeLists.txt +++ b/java/examples/datasets/CMakeLists.txt @@ -80,7 +80,7 @@ MACRO (ADD_H5_TEST resultfile resultcode) -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}" -D "TEST_ARGS:STRING=${CMD_ARGS}${ARGN}" -D "TEST_PROGRAM=examples.datasets.${resultfile}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}" -D "TEST_OUTPUT=datasets/${resultfile}.out" -D "TEST_EXPECT=${resultcode}" diff --git a/java/examples/datatypes/CMakeLists.txt b/java/examples/datatypes/CMakeLists.txt index beacd7a..4a8b2a4 100644 --- a/java/examples/datatypes/CMakeLists.txt +++ b/java/examples/datatypes/CMakeLists.txt @@ -65,7 +65,7 @@ MACRO (ADD_H5_TEST resultfile resultcode) -D "TEST_PROGRAM=examples.datatypes.${resultfile}" -D "TEST_ARGS:STRING=${CMD_ARGS}${ARGN}" -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}" -D "TEST_OUTPUT=datatypes/${resultfile}.out" -D "TEST_EXPECT=${resultcode}" diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt index d406cab..2c5d33b 100644 --- a/java/examples/groups/CMakeLists.txt +++ b/java/examples/groups/CMakeLists.txt @@ -64,7 +64,7 @@ MACRO (ADD_H5_TEST resultfile resultcode) -D "TEST_PROGRAM=examples.groups.${resultfile}" -D "TEST_ARGS:STRING=${CMD_ARGS}${ARGN}" -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}" -D "TEST_OUTPUT=groups/${resultfile}.out" -D "TEST_EXPECT=${resultcode}" diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt index 8c9485f..8d56b86 100644 --- a/java/examples/intro/CMakeLists.txt +++ b/java/examples/intro/CMakeLists.txt @@ -66,7 +66,7 @@ MACRO (ADD_H5_TEST resultfile resultcode) -D "TEST_PROGRAM=examples.intro.${resultfile}" -D "TEST_ARGS:STRING=${CMD_ARGS}${ARGN}" -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}" -D "TEST_OUTPUT=intro/${resultfile}.out" -D "TEST_EXPECT=${resultcode}" diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 710a5e0..b76f572 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -111,7 +111,7 @@ foreach (test_file ${HDF5_JAVA_TEST_SOURCES}) -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}" -D "TEST_ARGS:STRING=${CMD_ARGS}-ea;org.junit.runner.JUnitCore" -D "TEST_PROGRAM=test.${test_file}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" -D "TEST_FOLDER=${HDF5_BINARY_DIR}/java/test" -D "TEST_OUTPUT=JUnit-${test_file}.out" # -D "TEST_LOG_LEVEL=trace" |