diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-07-27 15:39:54 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-07-27 15:39:54 (GMT) |
commit | 54497d2b53c965aa995af37f89d24343af30a56f (patch) | |
tree | efde294ce1689680fedcec806b8cb7ef7b2a8942 /hl/src | |
parent | f56008e0fe0c6bce99205911d05dd4396baf6952 (diff) | |
parent | f56de2644447b080017866fb917a0f8363315a53 (diff) | |
download | hdf5-54497d2b53c965aa995af37f89d24343af30a56f.zip hdf5-54497d2b53c965aa995af37f89d24343af30a56f.tar.gz hdf5-54497d2b53c965aa995af37f89d24343af30a56f.tar.bz2 |
[svn-r27436] merge from trunk.
Diffstat (limited to 'hl/src')
-rw-r--r-- | hl/src/CMakeLists.txt | 5 | ||||
-rw-r--r-- | hl/src/Makefile.in | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index 3c24e40..47029d7 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -44,7 +44,7 @@ set_target_properties (${HDF5_HL_LIB_TARGET} PROPERTIES set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_TARGET}") #----------------------------------------------------------------------------- -# Add file(s) to CMake Install +# Add file(s) to CMake Install #----------------------------------------------------------------------------- install ( FILES @@ -62,7 +62,7 @@ if (HDF5_EXPORTED_TARGETS) if (BUILD_SHARED_LIBS) INSTALL_TARGET_PDB (${HDF5_HL_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hllibraries) endif (BUILD_SHARED_LIBS) - + install ( TARGETS ${HDF5_HL_LIB_TARGET} @@ -71,5 +71,6 @@ if (HDF5_EXPORTED_TARGETS) LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hllibraries ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hllibraries RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT hllibraries + FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT hllibraries ) endif (HDF5_EXPORTED_TARGETS) diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 314b11d..d5b0b1e 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -661,7 +661,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 = 212 +LT_VERS_REVISION = 217 LT_VERS_AGE = 0 # This library is our main target. |