From 4d22405e482e4e943b9485c6809cad8d6fafcc30 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 25 Jul 2022 17:50:38 +0200 Subject: CMake: Don't use PUBLIC_LIBRARIES for tests and test helpers Change-Id: I9b7404e1d3a78fe0726ec0f5ce1461f6c209e90d Reviewed-by: Alexey Edelev --- tests/auto/network/socket/platformsocketengine/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qabstractsocket/CMakeLists.txt | 2 +- tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qlocalsocket/CMakeLists.txt | 2 +- tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt | 2 +- tests/auto/network/socket/qsctpsocket/CMakeLists.txt | 2 +- tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt | 2 +- tests/auto/network/socket/qtcpserver/test/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt | 2 +- tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt | 2 +- tests/auto/network/socket/qudpsocket/test/CMakeLists.txt | 2 +- tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) (limited to 'tests/auto/network/socket') diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index 004f936242..c80702c41b 100644 --- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt @@ -11,7 +11,7 @@ endif() qt_internal_add_test(tst_platformsocketengine SOURCES tst_platformsocketengine.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::NetworkPrivate QT_TEST_SERVER_LIST "cyrus" # special case @@ -25,6 +25,6 @@ qt_internal_add_test(tst_platformsocketengine ##################################################################### qt_internal_extend_target(tst_platformsocketengine CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt index ee83261ab0..9af938acb6 100644 --- a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt @@ -7,6 +7,6 @@ qt_internal_add_test(tst_qabstractsocket SOURCES tst_qabstractsocket.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network ) diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index fcad653783..a95828e53f 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -11,7 +11,7 @@ endif() qt_internal_add_test(tst_qhttpsocketengine SOURCES tst_qhttpsocketengine.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::NetworkPrivate QT_TEST_SERVER_LIST "squid" "danted" "cyrus" "apache2" # special case @@ -28,6 +28,6 @@ qt_internal_add_test(tst_qhttpsocketengine # QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" qt_internal_extend_target(tst_qhttpsocketengine CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt index a928736b1f..2b880466f0 100644 --- a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt @@ -8,7 +8,7 @@ qt_internal_add_test(tst_qlocalsocket DEFINES QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG - PUBLIC_LIBRARIES + LIBRARIES Qt::Network ) add_dependencies(tst_qlocalsocket socketprocess) diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt index adf1752ac0..98fef79fb3 100644 --- a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt +++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt @@ -8,7 +8,7 @@ qt_internal_add_executable(socketprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network Qt::Test ) diff --git a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt index af3f809113..3ae172bc6a 100644 --- a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt @@ -7,6 +7,6 @@ qt_internal_add_test(tst_qsctpsocket SOURCES tst_qsctpsocket.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network ) diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index 64f3aa7a9e..2c86f6d362 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -11,7 +11,7 @@ endif() qt_internal_add_test(tst_qsocks5socketengine SOURCES tst_qsocks5socketengine.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::NetworkPrivate QT_TEST_SERVER_LIST "danted" "apache2" "cyrus" # special case @@ -28,6 +28,6 @@ qt_internal_add_test(tst_qsocks5socketengine # QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus" qt_internal_extend_target(tst_qsocks5socketengine CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt index dd309ba605..33f9c956c1 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt @@ -8,7 +8,7 @@ qt_internal_add_executable(crashingServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network ) diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt index 47e566d268..53c4931cd8 100644 --- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt @@ -8,7 +8,7 @@ qt_internal_add_test(tst_qtcpserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qtcpserver.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network QT_TEST_SERVER_LIST "danted" "cyrus" "squid" "ftp-proxy" # special case ) @@ -24,7 +24,7 @@ add_dependencies(tst_qtcpserver ##################################################################### qt_internal_extend_target(tst_qtcpserver CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt index 950c4356e2..092c798938 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt @@ -9,7 +9,7 @@ qt_internal_add_executable(stressTest SOURCES Test.cpp Test.h main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network Qt::Test ) diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 759f655417..b6ed1e8bd0 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -8,7 +8,7 @@ qt_internal_add_test(tst_qtcpsocket OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qtcpsocket.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::NetworkPrivate QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" # special case @@ -18,7 +18,7 @@ qt_internal_add_test(tst_qtcpsocket ##################################################################### qt_internal_extend_target(tst_qtcpsocket CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt index 7c8b924ca9..b1f6af3d1b 100644 --- a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt @@ -8,6 +8,6 @@ qt_internal_add_executable(clientserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network ) diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt index 6a781aadc4..eb21cec54e 100644 --- a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt @@ -8,7 +8,7 @@ qt_internal_add_test(tst_qudpsocket OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qudpsocket.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network Qt::TestPrivate QT_TEST_SERVER_LIST "danted" "echo" # special case diff --git a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt index 4afeb529a7..699e044ad4 100644 --- a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt @@ -8,6 +8,6 @@ qt_internal_add_executable(udpServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network ) -- cgit v1.2.3