diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
commit | 628d267162895adef5a73e1cd5810030cc98335a (patch) | |
tree | 05471ae798eaef041ea98fecdd285c9380ce381a /java/examples/datasets | |
parent | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (diff) | |
parent | 7e93acd94f20c73d27bb2eb4f7b4389d88cfb299 (diff) | |
download | hdf5-628d267162895adef5a73e1cd5810030cc98335a.zip hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.gz hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.bz2 |
merge and fix conflict
Diffstat (limited to 'java/examples/datasets')
-rw-r--r-- | java/examples/datasets/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt index 8849524..02b9fdf 100644 --- a/java/examples/datasets/CMakeLists.txt +++ b/java/examples/datasets/CMakeLists.txt @@ -71,7 +71,7 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH}) set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}") endforeach () -if (BUILD_TESTING) +if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL) get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME) set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;") |