diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-09-25 21:43:57 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2020-09-25 21:43:57 (GMT) |
commit | ff0881f35ba3de1077b168dd5383e487081a23bb (patch) | |
tree | 4960ddb7db6ee0297f5f5371af3b0ee6315f42a4 /CMakeInstallation.cmake | |
parent | aa08db839e6aea89487be985704d57a0e424b21b (diff) | |
download | hdf5-ff0881f35ba3de1077b168dd5383e487081a23bb.zip hdf5-ff0881f35ba3de1077b168dd5383e487081a23bb.tar.gz hdf5-ff0881f35ba3de1077b168dd5383e487081a23bb.tar.bz2 |
OESS-98 merge with clang-format changes
Diffstat (limited to 'CMakeInstallation.cmake')
-rw-r--r-- | CMakeInstallation.cmake | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index a3b9632..799c117 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -53,7 +53,7 @@ endif () #----------------------------------------------------------------------------- set (HDF5_INCLUDES_BUILD_TIME ${HDF5_SRC_DIR} ${HDF5_CPP_SRC_DIR} ${HDF5_HL_SRC_DIR} - ${HDF5_TOOLS_SRC_DIR} ${HDF5_BINARY_DIR} + ${HDF5_TOOLS_SRC_DIR} ${HDF5_SRC_BINARY_DIR} ) #----------------------------------------------------------------------------- @@ -128,10 +128,10 @@ else () endif () configure_file ( ${HDF_RESOURCES_DIR}/libhdf5.settings.cmake.in - ${HDF5_BINARY_DIR}/libhdf5.settings ESCAPE_QUOTES @ONLY + ${HDF5_SRC_BINARY_DIR}/libhdf5.settings ESCAPE_QUOTES @ONLY ) install ( - FILES ${HDF5_BINARY_DIR}/libhdf5.settings + FILES ${HDF5_SRC_BINARY_DIR}/libhdf5.settings DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT libraries ) @@ -472,6 +472,13 @@ The HDF5 data model, file format, API, library, and tools are open and distribut set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;configinstall;/") endif () endif () + if (PLUGIN_FOUND AND PLUGIN_USE_EXTERNAL) + if (WIN32 OR MINGW) + set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${PLUGIN_BINARY_DIR};PLUGIN;ALL;/") + else () + set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${PLUGIN_BINARY_DIR};PLUGIN;libraries;/") + endif () + endif () endif () endif () |