diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2020-12-15 00:15:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 00:15:39 (GMT) |
| commit | d673ee0cdd826100f6c914ea0851d742699ed740 (patch) | |
| tree | d0ff5f967748b525275c3f37526d33aab87c702c /CMakeInstallation.cmake | |
| parent | 629fcdb3d05edeab2f72838e595b5cae1c858c97 (diff) | |
| download | hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.zip hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.tar.gz hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.tar.bz2 | |
OESS-98 Update plugin build option - HDF5 1 12 (#173)
* merge updates from develop
* remove extension on command
* Run autogen before chkmanifest
* Update release text files and whitespace cleanup
* Update list
* OESS-98 Update plugin build option
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index ccd4fbc..2626264 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -107,10 +107,6 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) VERSION ${HDF5_PACKAGE_VERSION} COMPATIBILITY SameMinorVersion ) - #configure_file ( - # ${HDF_RESOURCES_DIR}/hdf5-config-version.cmake.in - # ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake @ONLY - #) install ( FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/hdf5 @@ -249,19 +245,6 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) endif () endif () -if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - if (CMAKE_HOST_UNIX) - set (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" - CACHE PATH "Install path prefix, prepended onto install directories." FORCE) - else () - GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) - set (CMAKE_INSTALL_PREFIX - "${CMAKE_GENERIC_PROGRAM_FILES}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" - CACHE PATH "Install path prefix, prepended onto install directories." FORCE) - set (CMAKE_GENERIC_PROGRAM_FILES) - endif () -endif () - #----------------------------------------------------------------------------- # Set the cpack variables #----------------------------------------------------------------------------- |