diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-07-10 14:17:06 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-07-10 14:17:06 (GMT) |
| commit | 15f0ea3f174019d3e67e9157021229f0bc319a7b (patch) | |
| tree | 13c459c0345de9ac3ea2caf2f6c44c3d0e72b9b1 /c++ | |
| parent | b7d9670be340447e3ffb8e0e91e9b6b250f17b18 (diff) | |
| parent | 8bbe712961a9b88d5fda838ec745f40217c28c8c (diff) | |
| download | hdf5-15f0ea3f174019d3e67e9157021229f0bc319a7b.zip hdf5-15f0ea3f174019d3e67e9157021229f0bc319a7b.tar.gz hdf5-15f0ea3f174019d3e67e9157021229f0bc319a7b.tar.bz2 | |
[svn-r27369] merge from trunk.
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 2 | ||||
| -rw-r--r-- | c++/src/cpp_doc_config | 2 |
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 a4a7a74..54f8328 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -670,7 +670,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 = 213 +LT_VERS_REVISION = 214 LT_VERS_AGE = 0 # This is our main target diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 4ba3d22..dee3df9 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.223 currently under development +PROJECT_NUMBER = HDF5 version 1.9.224 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 |