diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-05-22 16:48:44 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-05-22 16:48:44 (GMT) |
| commit | 4ddd7704b6f07bf5f23cbb006b879f28ebd84492 (patch) | |
| tree | f40e6f0f6108d9b10fdf30ace82cf2e0ff9654b6 /config | |
| parent | 32f57355c28efb390a25865eb3adf9f0b66c6e56 (diff) | |
| parent | eb8d35dd8cfd7339c203f758cf9637ac1cdc7a96 (diff) | |
| download | hdf5-4ddd7704b6f07bf5f23cbb006b879f28ebd84492.zip hdf5-4ddd7704b6f07bf5f23cbb006b879f28ebd84492.tar.gz hdf5-4ddd7704b6f07bf5f23cbb006b879f28ebd84492.tar.bz2 | |
Merge branch 'develop' into hdf5_1_10.sync
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConversionTests.c | 12 | ||||
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c index 002bc88..321d879 100644 --- a/config/cmake/ConversionTests.c +++ b/config/cmake/ConversionTests.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdlib.h> -int main(void) HDF_NO_UBSAN +int HDF_NO_UBSAN main(void) { long double ld = 20041683600089727.779961L; long ll; @@ -86,7 +86,7 @@ done: #include <string.h> #include <stdlib.h> -int main(void) HDF_NO_UBSAN +int HDF_NO_UBSAN main(void) { long double ld; long ll; @@ -149,7 +149,7 @@ done: #include <string.h> #include <stdlib.h> -int main(void) HDF_NO_UBSAN +int HDF_NO_UBSAN main(void) { long double ld = 20041683600089727.779961L; long long ll; @@ -192,7 +192,7 @@ done: #include <string.h> #include <stdlib.h> -int main(void) HDF_NO_UBSAN +int HDF_NO_UBSAN main(void) { long double ld; long long ll; @@ -253,8 +253,8 @@ int FC_DUMMY_MAIN() { return 1;} #endif #endif -int -main () HDF_NO_UBSAN +int HDF_NO_UBSAN +main () { char *chp = "beefs"; diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index 2bdf38f..6c203e2 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -20,11 +20,11 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage) else () set (LIBHDF_VERSION ${HDF5_${libpackage}_PACKAGE_SOVERSION_MAJOR}) endif () - set_target_properties (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION}) + set_target_properties (${libtarget} PROPERTIES VERSION ${PACKAGE_SOVERSION}) if (WIN32) - set (${LIB_OUT_NAME} "${LIB_OUT_NAME}-${PACKAGE_SOVERSION}") + set (${LIB_OUT_NAME} "${LIB_OUT_NAME}-${LIBHDF_VERSION}") else () - set_target_properties (${libtarget} PROPERTIES SOVERSION ${PACKAGE_SOVERSION}) + set_target_properties (${libtarget} PROPERTIES SOVERSION ${LIBHDF_VERSION}) endif () endif () HDF_SET_LIB_OPTIONS (${libtarget} ${LIB_OUT_NAME} ${libtype}) |