diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-04-07 17:26:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-04-07 17:26:44 (GMT) |
| commit | ab2d9f1e9c44502f6dfe69969974a99d2953159d (patch) | |
| tree | 32d9a9298ab53b766baf1486704ca4ddd9b61d4b /CMakeInstallation.cmake | |
| parent | fadc2d8c61c975cd6a64443ffbaa9ff6999a2419 (diff) | |
| download | hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.zip hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.gz hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.bz2 | |
[svn-r24980] HDFFV-8290: Merge automake 1.14.1 changes from trunk
Tested: h5committest
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 0631c61..0604802 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -200,12 +200,12 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) ${HDF5_SOURCE_DIR}/release_docs/COPYING ${HDF5_SOURCE_DIR}/release_docs/RELEASE.txt ) - if (WIN32 AND NOT CYGWIN) + if (WIN32) set (release_files ${release_files} ${HDF5_SOURCE_DIR}/release_docs/USING_HDF5_VS.txt ) - endif (WIN32 AND NOT CYGWIN) + endif (WIN32) if (HDF5_PACK_INSTALL_DOCS) set (release_files ${release_files} @@ -214,18 +214,17 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) ${HDF5_SOURCE_DIR}/release_docs/INSTALL ) if (WIN32) - if (NOT CYGWIN) - set (release_files - ${release_files} - ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Windows.txt - ) - else (NOT CYGWIN) - set (release_files - ${release_files} - ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Cygwin.txt - ) - endif (NOT CYGWIN) + set (release_files + ${release_files} + ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Windows.txt + ) endif (WIN32) + if (CYGWIN) + set (release_files + ${release_files} + ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Cygwin.txt + ) + endif (CYGWIN) if (HDF5_ENABLE_PARALLEL) set (release_files ${release_files} |