diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-18 14:57:22 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-18 14:57:22 (GMT) |
| commit | 6a9b816bde987f6ced009b0b1d1793e43103e013 (patch) | |
| tree | 4b4bbc89768a4896c5fbd21bbe81084a8a84c2ef /test/CMakeTests.cmake | |
| parent | aef900c6741aea851b218169648185b1c8e5e435 (diff) | |
| parent | 601ae0ebbc2b766ebf2662315b3143b0f903d76b (diff) | |
| download | hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.zip hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.tar.gz hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.tar.bz2 | |
Merge pull request #861 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '601ae0ebbc2b766ebf2662315b3143b0f903d76b':
HDFFV-10392 change size of local array to 16 chars
HDFFV-10385 rework java names
HDFFV-10385 Use OUTPUT_NAME property instead of CMAKE_BUILD_TYPE
Revert CMAKE_BUILD_TYPE for matches - need to redesign
Diffstat (limited to 'test/CMakeTests.cmake')
| -rw-r--r-- | test/CMakeTests.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index a304485..165b6d8 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -1133,7 +1133,7 @@ if (HDF5_TEST_VFD) macro (CHECK_VFD_TEST vfdtest vfdname resultcode) if ("${vfdtest}" STREQUAL "flush1" OR "${vfdtest}" STREQUAL "flush2") if ("${vfdname}" STREQUAL "multi" OR "${vfdname}" STREQUAL "split") - if (NOT BUILD_SHARED_LIBS AND NOT HDF5_BUILD_TYPE MATCHES Debug) + if (NOT BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE MATCHES Debug) add_test (NAME VFD-${vfdname}-${vfdtest} COMMAND "${CMAKE_COMMAND}" -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>" @@ -1345,7 +1345,6 @@ endif () if (HDF5_BUILD_GENERATORS) macro (ADD_H5_GENERATOR genfile) add_executable (${genfile} ${HDF5_TEST_SOURCE_DIR}/${genfile}.c) - TARGET_NAMING (${genfile} STATIC) TARGET_C_PROPERTIES (${genfile} STATIC " " " ") target_link_libraries (${genfile} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (${genfile} PROPERTIES FOLDER generator/test) |