diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-07-31 15:07:00 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-07-31 15:07:00 (GMT) |
| commit | 4f5bdadd50783be3d20949048ede3ec3543ba5a4 (patch) | |
| tree | d976ea4e9b786ed18cd0d92cf30bb47569dde7d2 /config/cmake_ext_mod | |
| parent | 23b96a8dc8ccb7d60150a30133183df3a7ac270d (diff) | |
| download | hdf5-4f5bdadd50783be3d20949048ede3ec3543ba5a4.zip hdf5-4f5bdadd50783be3d20949048ede3ec3543ba5a4.tar.gz hdf5-4f5bdadd50783be3d20949048ede3ec3543ba5a4.tar.bz2 | |
Merge from develop
Diffstat (limited to 'config/cmake_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 5 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFUseCXX.cmake | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index b0deab7..9be30f7 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -322,17 +322,12 @@ if (NOT WINDOWS OR MINGW) HDF_FUNCTION_TEST (HAVE_OFF64_T) if (${HDF_PREFIX}_HAVE_OFF64_T) CHECK_FUNCTION_EXISTS (lseek64 ${HDF_PREFIX}_HAVE_LSEEK64) - CHECK_FUNCTION_EXISTS (fseeko64 ${HDF_PREFIX}_HAVE_FSEEKO64) - CHECK_FUNCTION_EXISTS (ftello64 ${HDF_PREFIX}_HAVE_FTELLO64) - CHECK_FUNCTION_EXISTS (ftruncate64 ${HDF_PREFIX}_HAVE_FTRUNCATE64) endif () CHECK_FUNCTION_EXISTS (fseeko ${HDF_PREFIX}_HAVE_FSEEKO) - CHECK_FUNCTION_EXISTS (ftello ${HDF_PREFIX}_HAVE_FTELLO) HDF_FUNCTION_TEST (HAVE_STAT64_STRUCT) if (HAVE_STAT64_STRUCT) - CHECK_FUNCTION_EXISTS (fstat64 ${HDF_PREFIX}_HAVE_FSTAT64) CHECK_FUNCTION_EXISTS (stat64 ${HDF_PREFIX}_HAVE_STAT64) endif () endif () diff --git a/config/cmake_ext_mod/HDFUseCXX.cmake b/config/cmake_ext_mod/HDFUseCXX.cmake index 3afcdb6..f293ec5 100644 --- a/config/cmake_ext_mod/HDFUseCXX.cmake +++ b/config/cmake_ext_mod/HDFUseCXX.cmake @@ -98,11 +98,11 @@ endmacro () if (CMAKE_CXX_COMPILER_LOADED) foreach (test OLD_HEADER_FILENAME - ${HDF_PREFIX}_NO_NAMESPACE - ${HDF_PREFIX}_NO_STD + HDF_NO_NAMESPACE + HDF_NO_STD BOOL_NOTDEFINED NO_STATIC_CAST - ${HDF_PREFIX}_CXX_HAVE_OFFSETOF + CXX_HAVE_OFFSETOF ) HDF_CXX_FUNCTION_TEST (${test}) endforeach () |