diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-22 17:56:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-22 17:56:54 (GMT) |
| commit | ef4aa562dd3af4b104cc3551d12fd5583f09ca1a (patch) | |
| tree | ade5507502a71f97b70674f2195016ad27d7a78c /CMakeLists.txt | |
| parent | 775fdbe92711de5e6929d825045f4ad63d01d51d (diff) | |
| download | hdf5-ef4aa562dd3af4b104cc3551d12fd5583f09ca1a.zip hdf5-ef4aa562dd3af4b104cc3551d12fd5583f09ca1a.tar.gz hdf5-ef4aa562dd3af4b104cc3551d12fd5583f09ca1a.tar.bz2 | |
HDFFV-10392,10393,01385 merge from develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e028b55..f6837fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,7 +328,7 @@ include (${HDF_RESOURCES_EXT_DIR}/HDFMacros.cmake) include (${HDF_RESOURCES_EXT_DIR}/HDFLibMacros.cmake) include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake) -SET_HDF5_BUILD_TYPE() +SET_HDF_BUILD_TYPE() #----------------------------------------------------------------------------- # Setup output Directories @@ -464,11 +464,9 @@ endif () set (EXE_EXT "") if (WIN32) set (EXE_EXT ".exe") - if (NOT CYGWIN) - add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1) - add_definitions (-D_CRT_SECURE_NO_WARNINGS) - add_definitions (-D_CONSOLE) - endif () + add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1) + add_definitions (-D_CRT_SECURE_NO_WARNINGS) + add_definitions (-D_CONSOLE) endif () if (MSVC) @@ -577,8 +575,6 @@ include (UserMacros.cmake) #----------------------------------------------------------------------------- # Include filter (zlib, szip, etc.) macros #----------------------------------------------------------------------------- -set (LINK_COMP_LIBS) -set (LINK_COMP_SHARED_LIBS) include (CMakeFilters.cmake) #----------------------------------------------------------------------------- |