summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/cmake/ConversionTests.c12
-rw-r--r--config/cmake/HDF5Macros.cmake6
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})