summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-02-15 22:04:06 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-02-15 22:04:06 (GMT)
commit58e6e3e102180e6ab454441869ec68b2ef506f20 (patch)
tree90ded4497024c3f7603b05167a0aa6322c7c60cf /java
parent122b63a5a27227f2349634f4e8f8e43d739255f5 (diff)
downloadhdf5-58e6e3e102180e6ab454441869ec68b2ef506f20.zip
hdf5-58e6e3e102180e6ab454441869ec68b2ef506f20.tar.gz
hdf5-58e6e3e102180e6ab454441869ec68b2ef506f20.tar.bz2
HDFFV-10703 macro vars need quotes
Diffstat (limited to 'java')
-rw-r--r--java/examples/datasets/CMakeLists.txt5
-rw-r--r--java/examples/groups/CMakeLists.txt4
2 files changed, 4 insertions, 5 deletions
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index 2338d0f..c327c86 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 ()
-MACRO (ADD_H5_TEST resultfile resultcode)
+macro (ADD_H5_TEST resultfile resultcode)
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
add_test (
NAME JAVA_datasets-${resultfile}
@@ -91,10 +91,9 @@ MACRO (ADD_H5_TEST resultfile resultcode)
set_tests_properties (JAVA_datasets-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "JAVA_datasets-${resultfile}")
-ENDMACRO ()
+endmacro ()
if (BUILD_TESTING)
-
foreach (example ${HDF_JAVA_EXAMPLES})
if (example STREQUAL "H5Ex_D_External")
add_test (
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt
index 631eba7..b31a186 100644
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@@ -55,7 +55,7 @@ foreach (h5_file ${HDF_JAVA_TEST_FILES})
endforeach ()
add_custom_target(H5Ex_G_Visit_files ALL COMMENT "Copying files needed by H5Ex_G_Visit tests" DEPENDS ${H5Ex_G_Visit_files_list})
-MACRO (ADD_H5_TEST resultfile resultcode)
+macro (ADD_H5_TEST resultfile resultcode)
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
add_test (
NAME JAVA_groups-${resultfile}
@@ -75,7 +75,7 @@ MACRO (ADD_H5_TEST resultfile resultcode)
set_tests_properties (JAVA_groups-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "JAVA_groups-${resultfile}")
-ENDMACRO ()
+endmacro ()
if (BUILD_TESTING)
foreach (example ${HDF_JAVA_EXAMPLES})