diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2013-07-30 20:18:27 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2013-07-30 20:18:27 (GMT) |
| commit | 4d080e50f6bde9746d2dc12ced01d7f5758965cb (patch) | |
| tree | 778c7a6ec441bcf5dfc0fa75570b5ec6288cebde /hl | |
| parent | 8e9a3a200bd58bb4a98f32452a60cd2eb23fa26c (diff) | |
| download | hdf5-4d080e50f6bde9746d2dc12ced01d7f5758965cb.zip hdf5-4d080e50f6bde9746d2dc12ced01d7f5758965cb.tar.gz hdf5-4d080e50f6bde9746d2dc12ced01d7f5758965cb.tar.bz2 | |
[svn-r23946] Bring revisions #23597 - #23670 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/src/Makefile.in | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index 5a2a7c4..89de4ca 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -27,7 +27,7 @@ INSTALL ( FILES ${HDF5_HL_CPP_HDRS} DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/hl/cpp + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT hlcppheaders ) diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index b360bf3..717e0ae 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -458,7 +458,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 139 +LT_VERS_REVISION = 141 LT_VERS_AGE = 0 # Include src directory diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index c580516..9ab0fb2 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -76,7 +76,7 @@ IF (WIN32 AND NOT CYGWIN) DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/ DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/fortran + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT fortheaders ) @@ -85,7 +85,7 @@ ELSE (WIN32 AND NOT CYGWIN) DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/ DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/fortran + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT fortheaders ) diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index fb54a54..ff77de7 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -474,7 +474,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 139 +LT_VERS_REVISION = 141 LT_VERS_AGE = 0 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \ -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index bbb788d..a2a47ad 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -457,7 +457,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 139 +LT_VERS_REVISION = 141 LT_VERS_AGE = 0 # This library is our main target. |