diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-15 19:57:45 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-15 19:57:45 (GMT) |
| commit | eaa8ab277491173b66d3b08ad74920547073e677 (patch) | |
| tree | 67d3b651dca4bcf84bb22fa8788508e366521525 /java/examples/intro | |
| parent | c3c60dc7b5d5104475748f9967135903e3974cc3 (diff) | |
| parent | f73103745e9b9165e9d399ddb5b9991d7fb2a9e5 (diff) | |
| download | hdf5-eaa8ab277491173b66d3b08ad74920547073e677.zip hdf5-eaa8ab277491173b66d3b08ad74920547073e677.tar.gz hdf5-eaa8ab277491173b66d3b08ad74920547073e677.tar.bz2 | |
Merge pull request #2270 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f73103745e9b9165e9d399ddb5b9991d7fb2a9e5':
HDFFV-11001 fix if block
HDFFV-11001 need to qualify all by parallel or serial types
HDDFV-11001 add note
HDFFV-11001 Add fine control over testing
Adjust regex for warnings
Update tools hid_t declarations with H5I_INVALID_HID
Diffstat (limited to 'java/examples/intro')
| -rw-r--r-- | java/examples/intro/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt index b56e3ad..a1ccd6b 100644 --- a/java/examples/intro/CMakeLists.txt +++ b/java/examples/intro/CMakeLists.txt @@ -45,7 +45,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}>;") |