summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-02-02 06:46:40 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-02-02 06:46:40 (GMT)
commitcd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9 (patch)
tree9f39886657d25fd8bf621b8e1a769ad64dfb7534 /hl
parent45eefdbdea5aec34f67dabec64a5a1005483c095 (diff)
parent67f41bf9f80499f1e1f6dc8e27a599ba0a4b9ef3 (diff)
downloadhdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.zip
hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.tar.gz
hdf5-cd1d1d41df4d54f5e1121550c7f7eb7f83bcfab9.tar.bz2
[svn-r26096] Merged r26024-26095 from trunk.
Tested on: jam with Fortran and C++
Diffstat (limited to 'hl')
-rw-r--r--hl/c++/src/CMakeLists.txt2
-rw-r--r--hl/c++/src/Makefile.in2
-rw-r--r--hl/fortran/src/CMakeLists.txt4
-rw-r--r--hl/fortran/src/Makefile.in2
-rw-r--r--hl/src/CMakeLists.txt2
-rw-r--r--hl/src/Makefile.in2
6 files changed, 7 insertions, 7 deletions
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 9776f06..03ef26d 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -41,7 +41,7 @@ install (
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlcpplibraries)
+ INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlcpplibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 76589e7..6cbd447 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -671,7 +671,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 = 203
LT_VERS_AGE = 0
# This is our main target
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index c5b2d57..ee8604e 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -109,8 +109,8 @@ endif (WIN32)
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
- #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
+ INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
+ #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlfortlibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 686a405..686c23f 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -686,7 +686,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 = 203
LT_VERS_AGE = 0
# Our main target, the high-level fortran library
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index e3a72e4..9c9e3a9 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -60,7 +60,7 @@ install (
#-----------------------------------------------------------------------------
if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hllibraries)
+ INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hllibraries)
endif (BUILD_SHARED_LIBS)
install (
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 92c4f3b..29ead86 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -667,7 +667,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 = 203
LT_VERS_AGE = 0
# This library is our main target.