diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-25 22:35:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-25 22:35:26 (GMT) |
| commit | 6cea4f52ce08eff0efb70201667dc84da4fbd457 (patch) | |
| tree | 76dbadf088721b791331a3b4d3c7dcd4ffc58aaa /config | |
| parent | ddcae21908080ffbd40fcd5ce3244df5f391e02d (diff) | |
| download | hdf5-6cea4f52ce08eff0efb70201667dc84da4fbd457.zip hdf5-6cea4f52ce08eff0efb70201667dc84da4fbd457.tar.gz hdf5-6cea4f52ce08eff0efb70201667dc84da4fbd457.tar.bz2 | |
[svn-r19301] BZ 1958: Add h5dump xml tests to CMake support
Bring r19300 from trunk
Tetsed: local linux
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/HDF5Tests.c | 8 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.build.in | 3 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.install.in | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index c58eb3a..a7da4d3 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -493,6 +493,7 @@ ENDMACRO (HDF5_FUNCTION_TEST) IF (WINDOWS) SET (H5_HAVE_TIMEZONE 1) SET (H5_HAVE_FUNCTION 1) + SET (H5_LONE_COLON 0) ELSE (WINDOWS) FOREACH (test TIME_WITH_SYS_TIME @@ -515,6 +516,7 @@ ELSE (WINDOWS) HAVE_C99_FUNC HAVE_C99_DESIGNATED_INITIALIZER CXX_HAVE_OFFSETOF + LONE_COLON ) HDF5_FUNCTION_TEST (${test}) ENDFOREACH (test) diff --git a/config/cmake/HDF5Tests.c b/config/cmake/HDF5Tests.c index 35e7258..f909ed9 100644 --- a/config/cmake/HDF5Tests.c +++ b/config/cmake/HDF5Tests.c @@ -364,3 +364,11 @@ int main(void) } #endif +#ifdef LONE_COLON +int main(int argc, char * argv) +{ + return 0; +} +#endif + + diff --git a/config/cmake/hdf5-config.cmake.build.in b/config/cmake/hdf5-config.cmake.build.in index ecbde48..32bab7c 100644 --- a/config/cmake/hdf5-config.cmake.build.in +++ b/config/cmake/hdf5-config.cmake.build.in @@ -30,7 +30,7 @@ IF (HDF5_BUILD_HL_LIB) ENDIF (HDF5_BUILD_HL_LIB)
IF (HDF5_BUILD_TOOLS)
- SET (HDF5_INCLUDE_DIR_CPP ${HDF5_INCLUDE_DIR} )
+ SET (HDF5_INCLUDE_DIR_TOOLS ${HDF5_INCLUDE_DIR} )
ENDIF (HDF5_BUILD_TOOLS)
#-----------------------------------------------------------------------------
@@ -45,6 +45,5 @@ SET (HDF5_VERSION_MINOR @HDF5_VERSION_MINOR@) # project which has already build hdf5 as a subproject
#-----------------------------------------------------------------------------
IF (NOT TARGET "hdf5")
- GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
INCLUDE (${SELF_DIR}/hdf5-targets.cmake)
ENDIF (NOT TARGET "hdf5")
diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in index 4fda6e8..ba5ba9a 100644 --- a/config/cmake/hdf5-config.cmake.install.in +++ b/config/cmake/hdf5-config.cmake.install.in @@ -30,7 +30,7 @@ IF (HDF5_BUILD_HL_LIB) ENDIF (HDF5_BUILD_HL_LIB)
IF (HDF5_BUILD_TOOLS)
- SET (HDF5_INCLUDE_DIR_CPP "@CMAKE_INSTALL_PREFIX@/include/tools" )
+ SET (HDF5_INCLUDE_DIR_TOOLS "@CMAKE_INSTALL_PREFIX@/include/tools" )
ENDIF (HDF5_BUILD_TOOLS)
#-----------------------------------------------------------------------------
|