summaryrefslogtreecommitdiffstats
path: root/c++/src
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-07-14 15:34:45 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-07-14 15:34:45 (GMT)
commit2c897f41c044754f53f2fc3ea6f4c1dc1e9fa030 (patch)
tree70fb827d53dd7277aa380f409f52083c79b91b40 /c++/src
parent50c000fb49a34be4b5e600be9c4fc7bdea298860 (diff)
parent12b86abf18d831a2eeb337146187e220a50fafb2 (diff)
downloadhdf5-2c897f41c044754f53f2fc3ea6f4c1dc1e9fa030.zip
hdf5-2c897f41c044754f53f2fc3ea6f4c1dc1e9fa030.tar.gz
hdf5-2c897f41c044754f53f2fc3ea6f4c1dc1e9fa030.tar.bz2
[svn-r27378] svn merge -r27326:27377 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'c++/src')
-rw-r--r--c++/src/CMakeLists.txt5
-rw-r--r--c++/src/Makefile.in2
-rw-r--r--c++/src/cpp_doc_config2
3 files changed, 5 insertions, 4 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 2f3a0c4..44b912c 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -94,7 +94,7 @@ set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES
)
#-----------------------------------------------------------------------------
-# Add file(s) to CMake Install
+# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
install (
FILES
@@ -112,7 +112,7 @@ if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} cpplibraries)
endif (BUILD_SHARED_LIBS)
-
+
install (
TARGETS
${HDF5_CPP_LIB_TARGET}
@@ -121,5 +121,6 @@ if (HDF5_EXPORTED_TARGETS)
LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT cpplibraries
ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT cpplibraries
RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT cpplibraries
+ FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT cpplibraries
)
endif (HDF5_EXPORTED_TARGETS)
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 31c66da..63b520e 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -689,7 +689,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
# After making changes, run bin/reconfigure to update other configure related
# files like Makefile.in.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 214
+LT_VERS_REVISION = 215
LT_VERS_AGE = 0
# This is our main target
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index dee3df9..b7510a7 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -38,7 +38,7 @@ PROJECT_NAME = "HDF5 C++ API"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = HDF5 version 1.9.224 currently under development
+PROJECT_NUMBER = HDF5 version 1.9.225 currently under development
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a