diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-02-13 13:21:16 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-02-13 13:21:16 (GMT) |
| commit | e15ad88d9eb2962dc77848ac156d8b540bbb308d (patch) | |
| tree | f7d91397b6f600e228b9c08541c0dc8af36c4b56 /c++/src | |
| parent | 928d398be4143546e57c50788b429095328cb3ba (diff) | |
| parent | ab045c634cac0219939b93a1d2b829e7b1f3e7a1 (diff) | |
| download | hdf5-e15ad88d9eb2962dc77848ac156d8b540bbb308d.zip hdf5-e15ad88d9eb2962dc77848ac156d8b540bbb308d.tar.gz hdf5-e15ad88d9eb2962dc77848ac156d8b540bbb308d.tar.bz2 | |
[svn-r24701] merge from trunk to 24700.
fix return type for H5T_committed in H5Tget_create_plist.
Diffstat (limited to 'c++/src')
| -rw-r--r-- | c++/src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index e7ae371..af6283a 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -106,8 +106,9 @@ INSTALL ( # Add Target(s) to CMake Install for import into other projects #----------------------------------------------------------------------------- IF (HDF5_EXPORTED_TARGETS) - - INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} cpplibraries) + IF (BUILD_SHARED_LIBS) + INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} cpplibraries) + ENDIF (BUILD_SHARED_LIBS) INSTALL ( TARGETS diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index ef8094d..8f303f3 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -469,7 +469,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 |