diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-02-16 16:48:34 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-02-16 16:48:34 (GMT) |
| commit | 820b4dc39136072bccad1455fc0232ec9e710d58 (patch) | |
| tree | feaad5d3945808de30f58b19ff1c6fe23efa198d /c++ | |
| parent | 147fa90afae2c3a19501e35dfeb15101bf964b60 (diff) | |
| parent | 74fbb9e32794c315bf14a7c29c42c25a6ca2f5f3 (diff) | |
| download | hdf5-820b4dc39136072bccad1455fc0232ec9e710d58.zip hdf5-820b4dc39136072bccad1455fc0232ec9e710d58.tar.gz hdf5-820b4dc39136072bccad1455fc0232ec9e710d58.tar.bz2 | |
[svn-r26185] merge from trunk.
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/Makefile.in | 1 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 1 | ||||
| -rw-r--r-- | c++/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 3 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 1 |
5 files changed, 2 insertions, 6 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in index de87fa5..e5aa783 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -488,7 +488,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTRUMENT = @INSTRUMENT@ INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@ -LARGEFILE = @LARGEFILE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 3403db4..4841f59 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -436,7 +436,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTRUMENT = @INSTRUMENT@ INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@ -LARGEFILE = @LARGEFILE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index b07ab2b..c0e2f11 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -110,7 +110,7 @@ install ( #----------------------------------------------------------------------------- if (HDF5_EXPORTED_TARGETS) if (BUILD_SHARED_LIBS) - INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} cpplibraries) + INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} cpplibraries) endif (BUILD_SHARED_LIBS) install ( diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 7752e12..282d740 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -502,7 +502,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTRUMENT = @INSTRUMENT@ INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@ -LARGEFILE = @LARGEFILE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -683,7 +682,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 202 +LT_VERS_REVISION = 205 LT_VERS_AGE = 0 # This is our main target diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 49c08e4..c8edd4d 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -493,7 +493,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTRUMENT = @INSTRUMENT@ INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@ -LARGEFILE = @LARGEFILE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ |