diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-10-20 16:41:39 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-10-20 16:41:39 (GMT) |
| commit | 9e2fff4540bbbc1718e1395f101973800f706eb9 (patch) | |
| tree | 6a76948ae4cf1def6c3f6c81faf9808e8d4f0ddb | |
| parent | 3f74a217d04fc133a640cc1928fb97d3b6b696e5 (diff) | |
| download | hdf5-9e2fff4540bbbc1718e1395f101973800f706eb9.zip hdf5-9e2fff4540bbbc1718e1395f101973800f706eb9.tar.gz hdf5-9e2fff4540bbbc1718e1395f101973800f706eb9.tar.bz2 | |
[svn-r19650] Put back deleted library check in configure.
Remove shared library check around ws2_32.lib linking in test library. Issue on windows static builds.
Tested: windows
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 1 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 3e2bad9..fc479d7 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -206,6 +206,7 @@ IF (NOT WINDOWS) ENDIF (NOT WINDOWS) CHECK_LIBRARY_EXISTS_CONCAT ("ws2_32" WSAStartup H5_HAVE_LIBWS2_32) +CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" gethostbyname H5_HAVE_LIBWSOCK32) #CHECK_LIBRARY_EXISTS_CONCAT ("dl" dlopen H5_HAVE_LIBDL) CHECK_LIBRARY_EXISTS_CONCAT ("ucb" gethostname H5_HAVE_LIBUCB) CHECK_LIBRARY_EXISTS_CONCAT ("socket" connect H5_HAVE_LIBSOCKET) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2bed576..b3af7e6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -22,11 +22,9 @@ CONFIGURE_FILE (${HDF5_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY) INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY (${HDF5_TEST_LIB_TARGET} ${LIB_TYPE} ${TEST_LIB_SRCS} ${TEST_LIB_HEADERS}) -IF (BUILD_SHARED_LIBS) - IF (MSVC) - TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} "ws2_32.lib") - ENDIF (MSVC) -ENDIF (BUILD_SHARED_LIBS) +IF (MSVC) + TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} "ws2_32.lib") +ENDIF (MSVC) 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}) |