summaryrefslogtreecommitdiffstats
path: root/config/cmake
diff options
context:
space:
mode:
authorJerome Soumagne <jsoumagne@hdfgroup.org>2015-10-22 16:23:01 (GMT)
committerJerome Soumagne <jsoumagne@hdfgroup.org>2015-10-22 16:23:01 (GMT)
commit779154925282f5240e792f9b2e5b242a91005abb (patch)
treecb0ffbc4e1fb999e65df191058df0d9bbaad5bfa /config/cmake
parent37ed7e8b5f3fc60a9816c84d1ed71c9ba50ade08 (diff)
downloadhdf5-779154925282f5240e792f9b2e5b242a91005abb.zip
hdf5-779154925282f5240e792f9b2e5b242a91005abb.tar.gz
hdf5-779154925282f5240e792f9b2e5b242a91005abb.tar.bz2
[svn-r28188] Fix inline/__inline__/__inline detection with CMake after autotools changes
Diffstat (limited to 'config/cmake')
-rw-r--r--config/cmake/H5pubconf.h.in15
1 files changed, 9 insertions, 6 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index f01a9ff..5011b03 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -157,6 +157,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#cmakedefine H5_HAVE_GETTIMEOFDAY @H5_HAVE_GETTIMEOFDAY@
+/* Define if the compiler understands inline */
+#cmakedefine H5_HAVE_INLINE @H5_HAVE_INLINE@
+
/* Define if library will contain instrumentation to detect correct
optimization operation */
#cmakedefine H5_HAVE_INSTRUMENTED_LIBRARY @H5_HAVE_INSTRUMENTED_LIBRARY@
@@ -371,6 +374,12 @@
/* Define to 1 if you have the `_scrsize' function. */
#cmakedefine H5_HAVE__SCRSIZE @H5_HAVE__SCRSIZE@
+/* Define if the compiler understands __inline */
+#cmakedefine H5_HAVE___INLINE @H5_HAVE___INLINE@
+
+/* Define if the compiler understands __inline__ */
+#cmakedefine H5_HAVE___INLINE__ @H5_HAVE___INLINE__@
+
/* Define if HDF5's high-level library headers should be included in hdf5.h */
#cmakedefine H5_INCLUDE_HL @H5_INCLUDE_HL@
@@ -625,12 +634,6 @@
/* Define to empty if `const' does not conform to ANSI C. */
#cmakedefine H5_const
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#cmakedefine H5_inline @H5_inline@
-#endif
-
/* Define to `long int' if <sys/types.h> does not define. */
#cmakedefine H5_off_t