diff options
| -rw-r--r-- | java/examples/datasets/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | java/examples/groups/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/CMakeTests.cmake | 4 | ||||
| -rw-r--r-- | test/CMakeVFDTests.cmake | 6 | ||||
| -rw-r--r-- | test/CMakeVOLTests.cmake | 6 |
5 files changed, 12 insertions, 13 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}) diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 26e5a78..c606eb1 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -555,7 +555,7 @@ foreach (h5_test ${H5_TESTS}) WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) else () - if (h5_test STREQUAL "big" AND CYGWIN) + if ("${h5_test}" STREQUAL "big" AND CYGWIN) add_test (NAME H5TEST-${h5_test} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${test}" ) @@ -598,7 +598,7 @@ if (BUILD_SHARED_LIBS) foreach (h5_test ${H5_TESTS}) if (NOT h5_test IN_LIST H5TEST_SEPARATE_TESTS) - if (h5_test STREQUAL "big" AND CYGWIN) + if ("${h5_test}" STREQUAL "big" AND CYGWIN) add_test (NAME H5TEST-shared-${h5_test} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${test}-shared" ) diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake index ad3d1e9..a4cf26d 100644 --- a/test/CMakeVFDTests.cmake +++ b/test/CMakeVFDTests.cmake @@ -109,8 +109,8 @@ endif () # Windows only macro macro (CHECK_VFD_TEST vfdtest vfdname resultcode) - if (vfdtest STREQUAL "flush1" OR vfdtest STREQUAL "flush2") - if (vfdname STREQUAL "multi" OR vfdname STREQUAL "split") + if ("${vfdtest}" STREQUAL "flush1" OR "${vfdtest}" STREQUAL "flush2") + if ("${vfdname}" STREQUAL "multi" OR "${vfdname}" STREQUAL "split") if (NOT BUILD_SHARED_LIBS AND NOT HDF_CFG_NAME MATCHES "Debug") add_test ( NAME VFD-${vfdname}-${vfdtest}-clear-objects @@ -239,7 +239,7 @@ endif () ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname} ) - if (BUILD_SHARED_LIBS AND NOT vfdtest STREQUAL "cache") + if (BUILD_SHARED_LIBS AND NOT "${vfdtest}" STREQUAL "cache") add_test ( NAME VFD-${vfdname}-${vfdtest}-shared-clear-objects COMMAND ${CMAKE_COMMAND} diff --git a/test/CMakeVOLTests.cmake b/test/CMakeVOLTests.cmake index 7c02e23..cf47291 100644 --- a/test/CMakeVOLTests.cmake +++ b/test/CMakeVOLTests.cmake @@ -106,8 +106,8 @@ endif () # Windows only macro macro (CHECK_VOL_TEST voltest volname volinfo resultcode) - if (voltest STREQUAL "flush1" OR voltest STREQUAL "flush2") - if (volname STREQUAL "multi" OR volname STREQUAL "split") + if ("${voltest}" STREQUAL "flush1" OR "${voltest}" STREQUAL "flush2") + if ("${volname}" STREQUAL "multi" OR "${volname}" STREQUAL "split") if (NOT BUILD_SHARED_LIBS AND NOT ${HDF_CFG_NAME} MATCHES "Debug") add_test ( NAME VOL-${volname}-${voltest}-clear-objects @@ -236,7 +236,7 @@ endif () ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname};HDF5TestExpress=${HDF_TEST_EXPRESS}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname} ) - if (BUILD_SHARED_LIBS AND NOT voltest STREQUAL "cache") + if (BUILD_SHARED_LIBS AND NOT "${voltest}" STREQUAL "cache") add_test ( NAME VOL-${volname}-${voltest}-shared-clear-objects COMMAND ${CMAKE_COMMAND} |