summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2013-07-30 20:18:27 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2013-07-30 20:18:27 (GMT)
commit4d080e50f6bde9746d2dc12ced01d7f5758965cb (patch)
tree778c7a6ec441bcf5dfc0fa75570b5ec6288cebde /fortran
parent8e9a3a200bd58bb4a98f32452a60cd2eb23fa26c (diff)
downloadhdf5-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 'fortran')
-rw-r--r--fortran/src/CMakeLists.txt6
-rw-r--r--fortran/src/Makefile.in2
2 files changed, 4 insertions, 4 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index c41916a..1bddc56 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -254,7 +254,7 @@ INSTALL (
${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
DESTINATION
- ${HDF5_INSTALL_INCLUDE_DIR}/fortran
+ ${HDF5_INSTALL_INCLUDE_DIR}
COMPONENT
fortheaders
)
@@ -264,7 +264,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
)
@@ -273,7 +273,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/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 7379980..bae0cae 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -518,7 +518,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 in both Fortran and C flags (C compiler is used