From 7b4479d256534680d0124b1d075eea75b6188f03 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 19 Sep 2021 02:46:48 +0300 Subject: [PATCH] link QSocketNotifier test to socket and nsl libraries Signed-off-by: Ivailo Monev --- CMakeLists.txt | 28 +++++++++++------------ tests/auto/qsocketnotifier/CMakeLists.txt | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 940e29282..dab0ddd99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -423,6 +423,19 @@ endif() # only Solaris is known to have these find_library(SOCKET_LIBRARY NAMES socket) find_library(NSL_LIBRARY NAMES nsl) +set(SOCKET_AND_NSL_LIBRARIES) +if(SOCKET_LIBRARY) + set(SOCKET_AND_NSL_LIBRARIES + ${SOCKET_AND_NSL_LIBRARIES} + ${SOCKET_LIBRARY} + ) +endif() +if(NSL_LIBRARY) + set(SOCKET_AND_NSL_LIBRARIES + ${SOCKET_AND_NSL_LIBRARIES} + ${NSL_LIBRARY} + ) +endif() # used in components, tests and JavaScriptCore katie_check_header("cxxabi.h") @@ -449,20 +462,7 @@ katie_check_function(pthread_setname_np "pthread.h") cmake_reset_check_state() cmake_reset_check_state() -set(socket_and_nls_libraries) -if(SOCKET_LIBRARY) - set(socket_and_nls_libraries - ${socket_and_nls_libraries} - ${SOCKET_LIBRARY} - ) -endif() -if(NSL_LIBRARY) - set(socket_and_nls_libraries - ${socket_and_nls_libraries} - ${NSL_LIBRARY} - ) -endif() -set(CMAKE_REQUIRED_LIBRARIES ${socket_and_nls_libraries}) +set(CMAKE_REQUIRED_LIBRARIES ${SOCKET_AND_NSL_LIBRARIES}) katie_check_function(getifaddrs "ifaddrs.h") katie_check_function(accept4 "sys/socket.h") katie_check_function(paccept "sys/socket.h") diff --git a/tests/auto/qsocketnotifier/CMakeLists.txt b/tests/auto/qsocketnotifier/CMakeLists.txt index 1119e3c97..9e19e3dcf 100644 --- a/tests/auto/qsocketnotifier/CMakeLists.txt +++ b/tests/auto/qsocketnotifier/CMakeLists.txt @@ -2,4 +2,4 @@ katie_test(tst_qsocketnotifier ${CMAKE_CURRENT_SOURCE_DIR}/tst_qsocketnotifier.cpp ) -target_link_libraries(tst_qsocketnotifier KtNetwork) +target_link_libraries(tst_qsocketnotifier KtNetwork ${SOCKET_AND_NSL_LIBRARIES})