summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-04-07 15:39:13 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-04-07 15:39:13 (GMT)
commitc520294d672a35f023c249fec057c8adc387673e (patch)
treeaa0de71c4d813414c7b90d8d095d96d7c3c97e95
parent25b133091572bf43d51564db438220e83d0dc8fb (diff)
downloadhdf5-c520294d672a35f023c249fec057c8adc387673e.zip
hdf5-c520294d672a35f023c249fec057c8adc387673e.tar.gz
hdf5-c520294d672a35f023c249fec057c8adc387673e.tar.bz2
[svn-r24977] Remove WIN32 AND NOT CYGWIN if blocks - should be just WIN32
Tested: local linux CMake
-rw-r--r--CMakeInstallation.cmake25
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}