diff options
| -rw-r--r-- | CMakeLists.txt | 46 | ||||
| -rwxr-xr-x | config/cmake/CTestCustom.cmake | 24 | ||||
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 82 | ||||
| -rw-r--r-- | tools/h5copy/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tools/misc/CMakeLists.txt | 8 |
5 files changed, 118 insertions, 50 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b68d79..13c0df4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -514,7 +514,6 @@ ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT) #----------------------------------------------------------------------------- # Option for SzLib support #----------------------------------------------------------------------------- -SET (CMAKE_MODULE_PATH ${HDF5_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) OPTION (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) IF (HDF5_ENABLE_SZIP_SUPPORT) OPTION (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF) @@ -727,12 +726,31 @@ ENDIF (NOT HDF5_INSTALL_NO_DEVELOPMENT) #----------------------------------------------------------------------------- IF (NOT HDF5_EXTERNALLY_CONFIGURED) IF (HDF5_PACKAGE_EXTLIBS) + IF (WIN32 AND BUILD_SHARED_LIBS) + SET (HDF5_INSTALL_EXTLIB_DIR ${HDF5_INSTALL_BIN_DIR}) + ELSE (WIN32 AND BUILD_SHARED_LIBS) + SET (HDF5_INSTALL_EXTLIB_DIR ${HDF5_INSTALL_LIB_DIR}) + ENDIF (WIN32 AND BUILD_SHARED_LIBS) IF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND) INSTALL ( FILES ${ZLIB_INCLUDE_DIR}/zlib.h DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT headers ) + GET_PROPERTY (ZLIB_LIB TARGET ${ZLIB_LIBRARY} PROPERTY LOCATION_${BLDTYPE}) + INSTALL( + FILES ${ZLIB_LIB} + DESTINATION ${HDF5_INSTALL_EXTLIB_DIR} + COMPONENT libraries + ) + IF (WIN32 AND BUILD_SHARED_LIBS) + GET_PROPERTY (ZLIB_IMPLIB TARGET ${ZLIB_LIBRARY} PROPERTY IMPORTLIBRARY_${BLDTYPE}) + INSTALL( + FILES ${ZLIB_IMPLIB} + DESTINATION ${HDF5_INSTALL_LIB_DIR} + COMPONENT libraries + ) + ENDIF (WIN32 AND BUILD_SHARED_LIBS) ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND) IF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND) INSTALL ( @@ -740,24 +758,26 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT headers ) + GET_PROPERTY (SZIP_LIB TARGET ${SZIP_LIBRARY} PROPERTY LOCATION_${BLDTYPE}) + INSTALL( + FILES ${SZIP_LIB} + DESTINATION ${HDF5_INSTALL_EXTLIB_DIR} + COMPONENT libraries + ) + IF (WIN32 AND BUILD_SHARED_LIBS) + GET_PROPERTY (SZIP_IMPLIB TARGET ${SZIP_LIBRARY} PROPERTY IMPORTLIBRARY_${BLDTYPE}) + INSTALL( + FILES ${SZIP_IMPLIB} + DESTINATION ${HDF5_INSTALL_LIB_DIR} + COMPONENT libraries + ) + ENDIF (WIN32 AND BUILD_SHARED_LIBS) ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND) INSTALL ( FILES ${EXTERNAL_HEADER_LIST} DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT headers ) - INSTALL( - FILES ${EXTERNAL_LIBRARY_LIST} - DESTINATION ${HDF5_INSTALL_LIB_DIR} - COMPONENT libraries - ) - IF (WIN32 AND BUILD_SHARED_LIBS) - INSTALL( - FILES ${EXTERNAL_LIBRARYDLL_LIST} - DESTINATION ${HDF5_INSTALL_BIN_DIR} - COMPONENT libraries - ) - ENDIF (WIN32 AND BUILD_SHARED_LIBS) ENDIF (HDF5_PACKAGE_EXTLIBS) ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake index 1ae77bc..efc4443 100755 --- a/config/cmake/CTestCustom.cmake +++ b/config/cmake/CTestCustom.cmake @@ -222,40 +222,40 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE H5MKGRP_CMP-clear-h5mkgrp_version H5MKGRP-clear-h5mkgrp_single H5MKGRP-h5mkgrp_single #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_single #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_single #uses runTest.cmake H5MKGRP-clear-h5mkgrp_single-v H5MKGRP-h5mkgrp_single-v #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_single-v #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_single-v #uses runTest.cmake H5MKGRP-clear-h5mkgrp_single-p H5MKGRP-h5mkgrp_single-p #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_single-p #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_single-p #uses runTest.cmake H5MKGRP-clear-h5mkgrp_single_latest-l H5MKGRP-h5mkgrp_single_latest-l #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_single_latest-l #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_single_latest-l #uses runTest.cmake H5MKGRP-clear-h5mkgrp_several H5MKGRP-h5mkgrp_several #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_several #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_several #uses runTest.cmake H5MKGRP-clear-h5mkgrp_several-v H5MKGRP-h5mkgrp_several-v #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_several-v #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_several-v #uses runTest.cmake H5MKGRP-clear-h5mkgrp_several-p H5MKGRP-h5mkgrp_several-p #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_several-p #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_several-p #uses runTest.cmake H5MKGRP-clear-h5mkgrp_several_latest-l H5MKGRP-h5mkgrp_several_latest-l #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_several_latest-l #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_several_latest-l #uses runTest.cmake H5MKGRP-clear-h5mkgrp_nested-p H5MKGRP-h5mkgrp_nested-p #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_nested-p #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_nested-p #uses runTest.cmake H5MKGRP-clear-h5mkgrp_nested_latest-lp H5MKGRP-h5mkgrp_nested_latest-lp #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_nested_latest-lp #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_nested_latest-lp #uses runTest.cmake H5MKGRP-clear-h5mkgrp_nested_mult-p H5MKGRP-h5mkgrp_nested_mult-p #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_nested_mult-p #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_nested_mult-p #uses runTest.cmake H5MKGRP-clear-h5mkgrp_nested_mult_latest-lp H5MKGRP-h5mkgrp_nested_mult_latest-lp #uses runTest.cmake - H5MKGRP-H5LS-h5mkgrp_nested_mult_latest-lp #uses runTest.cmake + H5MKGRP-h5ls-h5mkgrp_nested_mult_latest-lp #uses runTest.cmake ######### examples ######### EXAMPLES-clear-objects cpp_ex-clear-objects diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index d8efad0..345c50d 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -48,13 +48,26 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) ELSE (${BLDTYPE} MATCHES "Debug") SET (DBG_EXT "") ENDIF (${BLDTYPE} MATCHES "Debug") - SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${JPEG_LIBRARY}) - IF (WIN32 AND NOT MINGW) - SET (JPEG_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/libjpeg${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}") + # Create imported target szip + ADD_LIBRARY(jpeg STATIC IMPORTED) + ADD_DEPENDENCIES (jpeg JPEG) + + IF (WIN32 AND NOT MINGW) + SET_TARGET_PROPERTIES(jpeg PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/libjpeg${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) ELSE (WIN32 AND NOT MINGW) - SET (JPEG_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libjpeg${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(jpeg PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libjpeg${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) ENDIF (WIN32 AND NOT MINGW) + +# INCLUDE (${BINARY_DIR}/JPEG-targets.cmake) + SET (JPEG_LIBRARY "jpeg") + SET (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}") SET (JPEG_INCLUDE_DIR "${SOURCE_DIR}/src") SET (JPEG_FOUND 1) @@ -117,21 +130,37 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) SET (DBG_EXT "") ENDIF (${BLDTYPE} MATCHES "Debug") + # Create imported target szip + ADD_LIBRARY(szip ${libtype} IMPORTED) + ADD_DEPENDENCIES (szip SZIP) + IF (${libtype} MATCHES "SHARED") IF (WIN32 AND NOT MINGW) - SET (SZIP_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_IMPORT_LIBRARY_SUFFIX}") - SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(szip PROPERTIES + IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_IMPORT_LIBRARY_SUFFIX}" + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}" + ) ELSE (WIN32 AND NOT MINGW) - SET (SZIP_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(szip PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}" + ) ENDIF (WIN32 AND NOT MINGW) ELSE (${libtype} MATCHES "SHARED") IF (WIN32 AND NOT MINGW) - SET (SZIP_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/libszip${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(szip PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/libszip${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) ELSE (WIN32 AND NOT MINGW) - SET (SZIP_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libszip${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(szip PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libszip${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) ENDIF (WIN32 AND NOT MINGW) ENDIF (${libtype} MATCHES "SHARED") - SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${SZIP_LIBRARY}) + +# INCLUDE (${BINARY_DIR}/SZIP-targets.cmake) + SET (SZIP_LIBRARY "szip") SET (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}") SET (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src") @@ -194,26 +223,45 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) ELSE (${BLDTYPE} MATCHES "Debug") SET (DBG_EXT "") ENDIF (${BLDTYPE} MATCHES "Debug") + + # Create imported target szip + ADD_LIBRARY(zlib ${libtype} IMPORTED) + ADD_DEPENDENCIES (zlib ZLIB) IF (${libtype} MATCHES "SHARED") IF (WIN32 AND NOT MINGW) - SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}zlib1${DBG_EXT}${CMAKE_IMPORT_LIBRARY_SUFFIX}") - SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}zlib1${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(zlib PROPERTIES + IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}zlib1${DBG_EXT}${CMAKE_IMPORT_LIBRARY_SUFFIX}" + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}zlib1${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}" + ) ELSE (WIN32 AND NOT MINGW) - SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}z${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(zlib PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}z${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}" + ) ENDIF (WIN32 AND NOT MINGW) ELSE (${libtype} MATCHES "SHARED") IF (WIN32 AND NOT MINGW) IF (HDF_LEGACY_NAMING) - SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/zlib${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(zlib PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/zlib${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) ELSE (HDF_LEGACY_NAMING) - SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/libzlib${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(zlib PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/libzlib${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) ENDIF (HDF_LEGACY_NAMING) ELSE (WIN32 AND NOT MINGW) - SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libz${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}") + SET_TARGET_PROPERTIES(zlib PROPERTIES + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/libz${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) ENDIF (WIN32 AND NOT MINGW) ENDIF (${libtype} MATCHES "SHARED") - SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${ZLIB_LIBRARY}) + +# INCLUDE (${BINARY_DIR}/ZLIB-targets.cmake) + SET (ZLIB_LIBRARY "zlib") SET (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}") SET (ZLIB_INCLUDE_DIR "${SOURCE_DIR}/src") diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt index b15f5c1..489ac90 100644 --- a/tools/h5copy/CMakeLists.txt +++ b/tools/h5copy/CMakeLists.txt @@ -131,10 +131,10 @@ IF (BUILD_TESTING) MACRO (ADD_H5LS_TEST file filetest) # If using memchecker add tests without using scripts IF (HDF5_ENABLE_USING_MEMCHECKER) - ADD_TEST (NAME H5COPY-H5LS_${file}-${filetest} COMMAND $<TARGET_FILE:h5ls> -Svr ./testfiles/${file}.out.h5) + ADD_TEST (NAME H5COPY-h5ls_${file}-${filetest} COMMAND $<TARGET_FILE:h5ls> -Svr ./testfiles/${file}.out.h5) ELSE (HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST ( - NAME H5COPY-H5LS_${file}-${filetest} + NAME H5COPY-h5ls_${file}-${filetest} COMMAND "${CMAKE_COMMAND}" -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>" -D "TEST_ARGS=-Svr;./testfiles/${file}.out.h5" @@ -147,9 +147,9 @@ IF (BUILD_TESTING) ) ENDIF (HDF5_ENABLE_USING_MEMCHECKER) IF (NOT "${last_test}" STREQUAL "") - SET_TESTS_PROPERTIES (H5COPY-H5LS_${file}-${filetest} PROPERTIES DEPENDS ${last_test}) + SET_TESTS_PROPERTIES (H5COPY-h5ls_${file}-${filetest} PROPERTIES DEPENDS ${last_test}) ENDIF (NOT "${last_test}" STREQUAL "") - SET (last_test "H5COPY-H5LS_${file}-${filetest}") + SET (last_test "H5COPY-h5ls_${file}-${filetest}") ENDMACRO (ADD_H5LS_TEST) # diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index b4e7078..148a60f 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -141,7 +141,7 @@ IF (BUILD_TESTING) SET_TESTS_PROPERTIES (H5MKGRP-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile}${resultoption}) IF (NOT HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST ( - NAME H5MKGRP-H5LS-${resultfile}${resultoption} + NAME H5MKGRP-h5ls-${resultfile}${resultoption} COMMAND "${CMAKE_COMMAND}" -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>" -D "TEST_ARGS:STRING=-v;-r;../testfiles/${resultfile}.h5" @@ -152,7 +152,7 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.ls" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) - SET_TESTS_PROPERTIES (H5MKGRP-H5LS-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-${resultfile}${resultoption}) + SET_TESTS_PROPERTIES (H5MKGRP-h5ls-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-${resultfile}${resultoption}) ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER) ELSE (NOT ${resultoption} STREQUAL " ") ADD_TEST ( @@ -170,7 +170,7 @@ IF (BUILD_TESTING) SET_TESTS_PROPERTIES (H5MKGRP-${resultfile} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile}) IF (NOT HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST ( - NAME H5MKGRP-H5LS-${resultfile} + NAME H5MKGRP-h5ls-${resultfile} COMMAND "${CMAKE_COMMAND}" -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>" -D "TEST_ARGS:STRING=-v;-r;../testfiles/${resultfile}.h5" @@ -181,7 +181,7 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.ls" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) - SET_TESTS_PROPERTIES (H5MKGRP-H5LS-${resultfile} PROPERTIES DEPENDS H5MKGRP-${resultfile}) + SET_TESTS_PROPERTIES (H5MKGRP-h5ls-${resultfile} PROPERTIES DEPENDS H5MKGRP-${resultfile}) ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER) ENDIF (NOT ${resultoption} STREQUAL " ") ENDMACRO (ADD_H5_TEST resultfile resultcode resultoption) |