diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-09-24 20:02:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 20:02:33 (GMT) |
| commit | 108c7397372751efe5f953c854673cbcfc7356ca (patch) | |
| tree | b826ec01ec8dba1e2889021675d11631d8c84b4d /config/cmake_ext_mod | |
| parent | 9e93204a23346a5b7cf5b8673cf50e6ac2497021 (diff) | |
| download | hdf5-108c7397372751efe5f953c854673cbcfc7356ca.zip hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.gz hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.bz2 | |
1.8 Merge config changes from dev (#1032)
* Merge config changes from dev
* Revert added git file changes
* Merge MS clang needs EHsc flag #1035
Diffstat (limited to 'config/cmake_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 16 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFUseCXX.cmake | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index 61a47be..e89d91e 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -396,15 +396,13 @@ HDF_CHECK_TYPE_SIZE (uint_least64_t ${HDF_PREFIX}_SIZEOF_UINT_LEAST64_T) HDF_CHECK_TYPE_SIZE (int_fast64_t ${HDF_PREFIX}_SIZEOF_INT_FAST64_T) HDF_CHECK_TYPE_SIZE (uint_fast64_t ${HDF_PREFIX}_SIZEOF_UINT_FAST64_T) -if (NOT APPLE) - HDF_CHECK_TYPE_SIZE (size_t ${HDF_PREFIX}_SIZEOF_SIZE_T) - HDF_CHECK_TYPE_SIZE (ssize_t ${HDF_PREFIX}_SIZEOF_SSIZE_T) - if (NOT ${HDF_PREFIX}_SIZEOF_SSIZE_T) - set (${HDF_PREFIX}_SIZEOF_SSIZE_T 0) - endif () - if (MINGW OR NOT WINDOWS) - HDF_CHECK_TYPE_SIZE (ptrdiff_t ${HDF_PREFIX}_SIZEOF_PTRDIFF_T) - endif () +HDF_CHECK_TYPE_SIZE (size_t ${HDF_PREFIX}_SIZEOF_SIZE_T) +HDF_CHECK_TYPE_SIZE (ssize_t ${HDF_PREFIX}_SIZEOF_SSIZE_T) +if (NOT ${HDF_PREFIX}_SIZEOF_SSIZE_T) + set (${HDF_PREFIX}_SIZEOF_SSIZE_T 0) +endif () +if (MINGW OR NOT WINDOWS) + HDF_CHECK_TYPE_SIZE (ptrdiff_t ${HDF_PREFIX}_SIZEOF_PTRDIFF_T) endif () HDF_CHECK_TYPE_SIZE (off_t ${HDF_PREFIX}_SIZEOF_OFF_T) diff --git a/config/cmake_ext_mod/HDFUseCXX.cmake b/config/cmake_ext_mod/HDFUseCXX.cmake index 28e7f8a..63101bb 100644 --- a/config/cmake_ext_mod/HDFUseCXX.cmake +++ b/config/cmake_ext_mod/HDFUseCXX.cmake @@ -43,6 +43,9 @@ if (${HDF_PREFIX}_HAVE_STDINT_H AND CMAKE_CXX_COMPILER_LOADED) endif () endif () +#Always define +set (${HDF_PREFIX}_CXX_HAVE_OFFSETOF 1) + # For other CXX specific tests, use this MACRO. macro (HDF_CXX_FUNCTION_TEST OTHER_TEST) if (NOT DEFINED ${OTHER_TEST}) @@ -108,7 +111,6 @@ if (CMAKE_CXX_COMPILER_LOADED) HDF_NO_STD BOOL_NOTDEFINED NO_STATIC_CAST - CXX_HAVE_OFFSETOF ) HDF_CXX_FUNCTION_TEST (${cxx_test}) endforeach () |