diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-12-09 19:55:10 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-12-09 19:55:10 (GMT) |
| commit | b21f51c38fe83e5a1597a3d468ec3d31d166a476 (patch) | |
| tree | b061f53a19b1b926ac0f75bf95525b82fe603f5c | |
| parent | c1763bef53178fa9c3e2537e7c36cdaa3e173c4c (diff) | |
| download | hdf5-b21f51c38fe83e5a1597a3d468ec3d31d166a476.zip hdf5-b21f51c38fe83e5a1597a3d468ec3d31d166a476.tar.gz hdf5-b21f51c38fe83e5a1597a3d468ec3d31d166a476.tar.bz2 | |
[svn-r25868] HDFFV-9041: Definitions needed to be a semi-colon separated list.
| -rw-r--r-- | release_docs/RELEASE.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 6a68d08..894598f 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -431,6 +431,14 @@ Bug Fixes since HDF5-1.8.0 release Library ------- + - Incorrect usage of list in CMake COMPILE_DEFINITIONS set_property + + The CMake command, set_property with COMPILE_DEFINITIONS property + needs a quoted semi-colon separated list of values. CMake will + transform the list to a series of -D{value} for the compile. + + (ADB - 2014/12/09, HDFV-9041) + - H5Z.c: H5Zfilter_avail(H5Z_filter_t id) Added else block if the call to the internal H5Z_filter_avail(id) does not fail and returns FALSE. This block calls the H5PL_load(H5PL_TYPE_FILTER, (int)id) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d5d57d4..2dc68c1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -878,10 +878,7 @@ option (HDF5_ENABLE_DEBUG_APIS "Turn on debugging in all packages" OFF) if (HDF5_ENABLE_DEBUG_APIS) set_target_properties (${HDF5_LIB_TARGET} PROPERTIES COMPILE_DEFINITIONS - "-DH5Z_DEBUG -DH5VM_DEBUG -DH5T_DEBUG - -DH5S_DEBUG -DH5P_DEBUG -DH5O_DEBUG -DH5MM_DEBUG -DH5MF_DEBUG - -DH5I_DEBUG -DH5HL_DEBUG -DH5HG_DEBUG -DH5G_DEBUG -DH5F_DEBUG - -DH5E_DEBUG -DH5D_DEBUG -DH5B_DEBUG -DH5AC_DEBUG -UNDEBUG" + "H5Z_DEBUG;H5VM_DEBUG;H5T_DEBUG;H5S_DEBUG;H5P_DEBUG;H5O_DEBUG;H5MM_DEBUG;H5MF_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5HG_DEBUG;H5G_DEBUG;H5F_DEBUG;H5E_DEBUG;H5D_DEBUG;H5B_DEBUG;H5AC_DEBUG" ) endif (HDF5_ENABLE_DEBUG_APIS) |