diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 23:10:08 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 23:10:08 (GMT) |
commit | abf6bb125007b9df5cbd1c10f63541a1f0e65bb1 (patch) | |
tree | b5bc1e908176a63328cc727790c1246801829778 /config/cmake_ext_mod/ConfigureChecks.cmake | |
parent | bd7b943c452a54a37a7bde0d56caf4d4bc2768f8 (diff) | |
parent | f30381d33d9e179ec30a8b46c2db218f2c45d2c1 (diff) | |
download | hdf5-abf6bb125007b9df5cbd1c10f63541a1f0e65bb1.zip hdf5-abf6bb125007b9df5cbd1c10f63541a1f0e65bb1.tar.gz hdf5-abf6bb125007b9df5cbd1c10f63541a1f0e65bb1.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_12)
* commit 'f30381d33d9e179ec30a8b46c2db218f2c45d2c1':
Fix issues when using ONLY_SHARED_LIBS
Change defines to not conflict with windows
Correct assignment
Fix h5watch fault
Add missing include folder
Fix reference file
Correct testfile name
Remove program find - future rework
Fix compile error and add ref destroy to Java test
HDFFV-10876 Merge from develop
Remove unneeded flag overwrites
Diffstat (limited to 'config/cmake_ext_mod/ConfigureChecks.cmake')
-rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index abc88ed..52cb7dd 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -83,9 +83,6 @@ endif () if (WINDOWS) set (HDF5_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib") set (${HDF_PREFIX}_HAVE_WIN32_API 1) - set (${HDF_PREFIX}_HAVE_STDDEF_H 1) - set (${HDF_PREFIX}_HAVE_SYS_STAT_H 1) - set (${HDF_PREFIX}_HAVE_SYS_TYPES_H 1) set (${HDF_PREFIX}_HAVE_LIBM 1) set (${HDF_PREFIX}_HAVE_STRDUP 1) set (${HDF_PREFIX}_HAVE_SYSTEM 1) |