diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-04 16:05:27 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-04 16:05:27 (GMT) |
| commit | e5e96cf1fd9462f0f1dc4c690555306b752a6637 (patch) | |
| tree | 3621fbbb5cbbe49f0ccf230042c752d6967f715c /config/cmake | |
| parent | 394f6f50bfaeef0a68b7c363db523305aa0882e2 (diff) | |
| download | hdf5-e5e96cf1fd9462f0f1dc4c690555306b752a6637.zip hdf5-e5e96cf1fd9462f0f1dc4c690555306b752a6637.tar.gz hdf5-e5e96cf1fd9462f0f1dc4c690555306b752a6637.tar.bz2 | |
[svn-r26356] Bring revisions #25971 - 26109 from trunk to revise_chunks.
Also move check for swmr_read in each driver on reading beyond file eoa to H5FD_read()--
in sync with changes for revision #26002 in trunk.
h5committested.
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 2 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 78c8d9b..e74f4b9 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -14,7 +14,7 @@ set(CTEST_BUILD_CONFIGURATION "Release") #set(NO_MAC_FORTRAN "true") #set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON") #set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_ENABLE_F2003:BOOL=ON) -set(CTEST_USE_TAR_SOURCE "true") +set(CTEST_USE_TAR_SOURCE ${CTEST_SCRIPT_ARG}) ############################################################################################################### # Adjust the following SET Commands as needed diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in index 3e74aa7..8287c7b 100644 --- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in @@ -74,10 +74,10 @@ set (HDF5_VERSION_MINOR @HDF5_VERSION_MINOR@) #----------------------------------------------------------------------------- if (NOT TARGET "@HDF5_PACKAGE@") if (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib") - include (@PACKAGE_SHARE_INSTALL_DIR@/ZLIB/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) + include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) endif (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib") if (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip") - include (@PACKAGE_SHARE_INSTALL_DIR@/SZIP/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) + include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) endif (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip") include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) set (HDF5_LIBRARIES "@HDF5_LIBRARIES_TO_EXPORT@") |