diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2011-04-11 15:07:29 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2011-04-11 15:07:29 (GMT) |
commit | 47c80528facedd548666ebe87539f80e56968857 (patch) | |
tree | 9ab21eff6f0bb27cea30d1277f47440839d0275f /test | |
parent | 41a304212cd56c6aa7e923f041c5b397377e86bc (diff) | |
download | hdf5-47c80528facedd548666ebe87539f80e56968857.zip hdf5-47c80528facedd548666ebe87539f80e56968857.tar.gz hdf5-47c80528facedd548666ebe87539f80e56968857.tar.bz2 |
[svn-r20464] Merge cmake changes from trunk r20463, after weekend of tests on trunk.
Tested: local linux
Diffstat (limited to 'test')
-rw-r--r-- | test/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b8b8ef6..8cb55a6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -25,6 +25,9 @@ ADD_LIBRARY (${HDF5_TEST_LIB_TARGET} ${LIB_TYPE} ${TEST_LIB_SRCS} ${TEST_LIB_HEA IF (MSVC) TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} "ws2_32.lib") ENDIF (MSVC) +IF (MINGW) + TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} "wsock32.lib") +ENDIF (MINGW) TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TEST_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} ${LIB_TYPE}) |