diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-25 20:04:09 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-25 20:04:09 (GMT) |
| commit | 32f747588a2b34807f16698f6875dd7aaede241c (patch) | |
| tree | f60c0c02a4ad20726487e2d9820745091ed7c0ad | |
| parent | ee1b751d2a540a47d9a83885020b880f7973644f (diff) | |
| download | hdf5-32f747588a2b34807f16698f6875dd7aaede241c.zip hdf5-32f747588a2b34807f16698f6875dd7aaede241c.tar.gz hdf5-32f747588a2b34807f16698f6875dd7aaede241c.tar.bz2 | |
[svn-r27877] Added fcntl and flock to list of functions checked by CMake.
This avoids redefinition of #defines in H5private.h when
flock and co. exist.
Tested on: Ubuntu 15.04 VM w/ gcc 4.9.3 and CMake 3.3.2
NOTE: tests still fail, but compilation improves
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 | ||||
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 6b83d67..53ca8be 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -100,6 +100,9 @@ /* Define if library information should be embedded in the executables */ #cmakedefine H5_HAVE_EMBEDDED_LIBINFO @H5_HAVE_EMBEDDED_LIBINFO@ +/* Define to 1 if you have the `fcntl' function. */ +#cmakedefine H5_HAVE_FCNTL @H5_HAVE_FCNTL@ + /* Define to 1 if you have the <features.h> header file. */ #cmakedefine H5_HAVE_FEATURES_H @H5_HAVE_FEATURES_H@ diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index 6885187..61206f5 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -479,6 +479,8 @@ endif (NOT WINDOWS) # Check for some functions that are used # CHECK_FUNCTION_EXISTS (alarm ${HDF_PREFIX}_HAVE_ALARM) +CHECK_FUNCTION_EXISTS (fcntl ${HDF_PREFIX}_HAVE_FCNTL) +CHECK_FUNCTION_EXISTS (flock ${HDF_PREFIX}_HAVE_FLOCK) CHECK_FUNCTION_EXISTS (fork ${HDF_PREFIX}_HAVE_FORK) CHECK_FUNCTION_EXISTS (frexpf ${HDF_PREFIX}_HAVE_FREXPF) CHECK_FUNCTION_EXISTS (frexpl ${HDF_PREFIX}_HAVE_FREXPL) |