summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-08-02 14:05:02 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-08-02 14:05:02 (GMT)
commit2d8a18a1fdac369b39f8160eb22b1562406e31de (patch)
tree3c77a1282b620e20b75886b574cc3cb71ff4cbf5
parent02e41acebb23cbadff89a4488329578536adef32 (diff)
downloadhdf5-2d8a18a1fdac369b39f8160eb22b1562406e31de.zip
hdf5-2d8a18a1fdac369b39f8160eb22b1562406e31de.tar.gz
hdf5-2d8a18a1fdac369b39f8160eb22b1562406e31de.tar.bz2
[svn-r19165] Add configure changes from r19160 to CMake.
-rw-r--r--config/cmake/ConfigureChecks.cmake4
-rw-r--r--config/cmake/H5pubconf.h.in9
2 files changed, 12 insertions, 1 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 47e6521..0a447d5 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -366,6 +366,8 @@ CHECK_FUNCTION_EXISTS (ioctl H5_HAVE_IOCTL)
CHECK_FUNCTION_EXISTS (difftime H5_HAVE_DIFFTIME)
CHECK_FUNCTION_EXISTS (fseeko H5_HAVE_FSEEKO)
CHECK_FUNCTION_EXISTS (ftello H5_HAVE_FTELLO)
+CHECK_FUNCTION_EXISTS (fseeko64 H5_HAVE_FSEEKO64)
+CHECK_FUNCTION_EXISTS (ftello64 H5_HAVE_FTELLO64)
CHECK_FUNCTION_EXISTS (fstat64 H5_HAVE_FSTAT64)
CHECK_FUNCTION_EXISTS (stat64 H5_HAVE_STAT64)
@@ -466,7 +468,7 @@ MACRO (HDF5_FUNCTION_TEST OTHER_TEST)
# (STATUS "Performing ${OTHER_TEST}")
TRY_COMPILE (${OTHER_TEST}
${CMAKE_BINARY_DIR}
- ${HDF5_RESOURCES_DIR}//HDF5Tests.c
+ ${HDF5_RESOURCES_DIR}/HDF5Tests.c
CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
"${OTHER_TEST_ADD_LIBRARIES}"
OUTPUT_VARIABLE OUTPUT
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 3f4bdc5..e159523 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -148,12 +148,18 @@
/* Define to 1 if you have the `fseeko' function. */
#cmakedefine H5_HAVE_FSEEKO @H5_HAVE_FSEEKO@
+/* Define to 1 if you have the `fseeko64' function. */
+#cmakedefine H5_HAVE_FSEEKO64 @H5_HAVE_FSEEKO64@
+
/* Define to 1 if you have the `fstat64' function. */
#cmakedefine H5_HAVE_FSTAT64 @H5_HAVE_FSTAT64@
/* Define to 1 if you have the `ftello' function. */
#cmakedefine H5_HAVE_FTELLO @H5_HAVE_FTELLO@
+/* Define to 1 if you have the `ftello64' function. */
+#cmakedefine H5_HAVE_FTELLO64 @H5_HAVE_FTELLO64@
+
/* Define to 1 if you have the `ftruncate64' function. */
#cmakedefine H5_HAVE_FTRUNCATE64 @H5_HAVE_FTRUNCATE64@
@@ -317,6 +323,9 @@
/* Define to 1 if you have the <stdint.h> header file. */
#cmakedefine H5_HAVE_STDINT_H @H5_HAVE_STDINT_H@
+/* Define to 1 if you have the <stdint.h> header file for Cplusplus. */
+#cmakedefine H5_HAVE_STDINT_H_CXX @H5_HAVE_STDINT_H_CXX@
+
/* Define to 1 if you have the <stdlib.h> header file. */
#cmakedefine H5_HAVE_STDLIB_H @H5_HAVE_STDLIB_H@