diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-10 16:22:12 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-10 16:22:12 (GMT) |
| commit | 720e0c7623be9847867b9d857329ab626ee8f3e8 (patch) | |
| tree | 87dc28bb5957fcc4f54f548d20b26cd7b3747761 /hl | |
| parent | 519e23171052963775c47132ec0106727fdf5c41 (diff) | |
| download | hdf5-720e0c7623be9847867b9d857329ab626ee8f3e8.zip hdf5-720e0c7623be9847867b9d857329ab626ee8f3e8.tar.gz hdf5-720e0c7623be9847867b9d857329ab626ee8f3e8.tar.bz2 | |
[svn-r25250] Bring revisions #24670 - $24698 from trunk to revise_chunks.
Tested on jam, koala, ostrich, platypus.
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/src/Makefile.in | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index aa54889..34e1a7a 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -37,8 +37,9 @@ INSTALL ( # Add Target(s) to CMake Install for import into other projects #----------------------------------------------------------------------------- IF (HDF5_EXPORTED_TARGETS) - - INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlcpplibraries) + IF (BUILD_SHARED_LIBS) + INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlcpplibraries) + ENDIF (BUILD_SHARED_LIBS) INSTALL ( TARGETS diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 3d28ac9..2a0040c 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -460,7 +460,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 = 160 +LT_VERS_REVISION = 162 LT_VERS_AGE = 0 # Include src directory diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index e1a3206..7aa93cc2 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -476,7 +476,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 = 160 +LT_VERS_REVISION = 162 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 13daa39..29cd2f2 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -459,7 +459,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 = 160 +LT_VERS_REVISION = 162 LT_VERS_AGE = 0 # This library is our main target. |