summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-23 16:03:25 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-23 15:08:34 +0000
commita674d83d75a1f80fee8de63f8a5e2aadab931124 (patch)
tree049f42db9ef1da77156839b605b5b4e3a0d672f1
parent6b19edaefe7edcdc12a1faa269d77e42a14fc81d (diff)
downloadqtwebsockets-wip/cmake.tar.gz
CMake: Regenerate projects after mergewip/cmake
Change-Id: I3cdf755e3aae933016b9719ce4c61f53e554ea48 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/imports/qmlwebsockets/.prev_CMakeLists.txt5
-rw-r--r--src/imports/qmlwebsockets/CMakeLists.txt5
-rw-r--r--src/websockets/CMakeLists.txt2
-rw-r--r--tests/.prev_CMakeLists.txt9
-rw-r--r--tests/CMakeLists.txt8
-rw-r--r--tests/auto/qml/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/CMakeLists.txt2
-rw-r--r--tests/auto/websockets/dataprocessor/CMakeLists.txt4
-rw-r--r--tests/auto/websockets/handshakerequest/CMakeLists.txt4
-rw-r--r--tests/auto/websockets/handshakeresponse/CMakeLists.txt4
-rw-r--r--tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt4
-rw-r--r--tests/auto/websockets/websocketframe/CMakeLists.txt4
-rw-r--r--tests/auto/websockets/websocketprotocol/CMakeLists.txt4
13 files changed, 18 insertions, 39 deletions
diff --git a/src/imports/qmlwebsockets/.prev_CMakeLists.txt b/src/imports/qmlwebsockets/.prev_CMakeLists.txt
index a18d4d0..adb02fe 100644
--- a/src/imports/qmlwebsockets/.prev_CMakeLists.txt
+++ b/src/imports/qmlwebsockets/.prev_CMakeLists.txt
@@ -13,12 +13,9 @@ qt_add_qml_module(qmlwebsockets
qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h
qqmlwebsocket.cpp qqmlwebsocket.h
qqmlwebsocketserver.cpp qqmlwebsocketserver.h
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
- PUBLIC_LIBRARIES
- Qt::Core
- Qt::Qml
Qt::WebSockets
)
diff --git a/src/imports/qmlwebsockets/CMakeLists.txt b/src/imports/qmlwebsockets/CMakeLists.txt
index 29f2eb6..c182e6c 100644
--- a/src/imports/qmlwebsockets/CMakeLists.txt
+++ b/src/imports/qmlwebsockets/CMakeLists.txt
@@ -13,12 +13,9 @@ qt_add_qml_module(qmlwebsockets
qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h
qqmlwebsocket.cpp qqmlwebsocket.h
qqmlwebsocketserver.cpp qqmlwebsocketserver.h
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
- PUBLIC_LIBRARIES
- Qt::Core
- Qt::Qml
Qt::WebSockets
)
diff --git a/src/websockets/CMakeLists.txt b/src/websockets/CMakeLists.txt
index 1f0f705..0038bcc 100644
--- a/src/websockets/CMakeLists.txt
+++ b/src/websockets/CMakeLists.txt
@@ -22,6 +22,8 @@ qt_add_module(WebSockets
PUBLIC_LIBRARIES
Qt::Core
Qt::Network
+ PRIVATE_MODULE_INTERFACE
+ Qt::CorePrivate
)
#### Keys ignored in scope 1:.:.:websockets.pro:<TRUE>:
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
index 806a854..2214137 100644
--- a/tests/.prev_CMakeLists.txt
+++ b/tests/.prev_CMakeLists.txt
@@ -1,10 +1,7 @@
# Generated from tests.pro.
-if(NOT TARGET Qt::Test)
- cmake_minimum_required(VERSION 3.15.0)
- project(QtWebSocketsTests VERSION 6.0.0 LANGUAGES C CXX)
- find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
- find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
- qt_set_up_standalone_tests_build()
+if(QT_BUILD_STANDALONE_TESTS)
+ # Add qt_find_package calls for extra dependencies that need to be found when building
+ # the standalone tests here.
endif()
qt_build_tests()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3d7cc10..8825444 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,8 @@
# Generated from tests.pro.
-if(NOT TARGET Qt::Test)
- cmake_minimum_required(VERSION 3.15.0)
- project(QtWebSocketsTests VERSION 6.0.0 LANGUAGES C CXX)
- find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Network Test Qml Quick QuickTest WebSockets) # special case
- qt_set_up_standalone_tests_build()
+if(QT_BUILD_STANDALONE_TESTS)
+ # Add qt_find_package calls for extra dependencies that need to be found when building
+ # the standalone tests here.
endif()
qt_build_tests()
diff --git a/tests/auto/qml/.prev_CMakeLists.txt b/tests/auto/qml/.prev_CMakeLists.txt
index e8d92cc..96eef3f 100644
--- a/tests/auto/qml/.prev_CMakeLists.txt
+++ b/tests/auto/qml/.prev_CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from qml.pro.
-if(NOT APPLE_UIKIT)
+if(NOT UIKIT)
add_subdirectory(qmlwebsockets)
add_subdirectory(qmlwebsockets_compat)
endif()
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index 41470a7..8788707 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from qml.pro.
-if(NOT APPLE_UIKIT)
+if(NOT UIKIT)
add_subdirectory(qmlwebsockets)
# add_subdirectory(qmlwebsockets_compat) # special case remove
endif()
diff --git a/tests/auto/websockets/dataprocessor/CMakeLists.txt b/tests/auto/websockets/dataprocessor/CMakeLists.txt
index 7f17f97..6ea9ed4 100644
--- a/tests/auto/websockets/dataprocessor/CMakeLists.txt
+++ b/tests/auto/websockets/dataprocessor/CMakeLists.txt
@@ -11,10 +11,8 @@ endif()
qt_add_test(tst_dataprocessor
SOURCES
tst_dataprocessor.cpp
- LIBRARIES
- Qt::WebSocketsPrivate
PUBLIC_LIBRARIES
- Qt::WebSockets
+ Qt::WebSocketsPrivate
)
#### Keys ignored in scope 1:.:.:dataprocessor.pro:<TRUE>:
diff --git a/tests/auto/websockets/handshakerequest/CMakeLists.txt b/tests/auto/websockets/handshakerequest/CMakeLists.txt
index 634e462..2dd3d64 100644
--- a/tests/auto/websockets/handshakerequest/CMakeLists.txt
+++ b/tests/auto/websockets/handshakerequest/CMakeLists.txt
@@ -11,10 +11,8 @@ endif()
qt_add_test(tst_handshakerequest
SOURCES
tst_handshakerequest.cpp
- LIBRARIES
- Qt::WebSocketsPrivate
PUBLIC_LIBRARIES
- Qt::WebSockets
+ Qt::WebSocketsPrivate
)
#### Keys ignored in scope 1:.:.:handshakerequest.pro:<TRUE>:
diff --git a/tests/auto/websockets/handshakeresponse/CMakeLists.txt b/tests/auto/websockets/handshakeresponse/CMakeLists.txt
index 84cdebf..82b84e0 100644
--- a/tests/auto/websockets/handshakeresponse/CMakeLists.txt
+++ b/tests/auto/websockets/handshakeresponse/CMakeLists.txt
@@ -11,10 +11,8 @@ endif()
qt_add_test(tst_handshakeresponse
SOURCES
tst_handshakeresponse.cpp
- LIBRARIES
- Qt::WebSocketsPrivate
PUBLIC_LIBRARIES
- Qt::WebSockets
+ Qt::WebSocketsPrivate
)
#### Keys ignored in scope 1:.:.:handshakeresponse.pro:<TRUE>:
diff --git a/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt b/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
index bd473af..9d12b6a 100644
--- a/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
+++ b/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
@@ -11,10 +11,8 @@ endif()
qt_add_test(tst_defaultmaskgenerator
SOURCES
tst_defaultmaskgenerator.cpp
- LIBRARIES
- Qt::WebSocketsPrivate
PUBLIC_LIBRARIES
- Qt::WebSockets
+ Qt::WebSocketsPrivate
)
#### Keys ignored in scope 1:.:.:qdefaultmaskgenerator.pro:<TRUE>:
diff --git a/tests/auto/websockets/websocketframe/CMakeLists.txt b/tests/auto/websockets/websocketframe/CMakeLists.txt
index bcbccf2..91380bf 100644
--- a/tests/auto/websockets/websocketframe/CMakeLists.txt
+++ b/tests/auto/websockets/websocketframe/CMakeLists.txt
@@ -11,10 +11,8 @@ endif()
qt_add_test(tst_websocketframe
SOURCES
tst_websocketframe.cpp
- LIBRARIES
- Qt::WebSocketsPrivate
PUBLIC_LIBRARIES
- Qt::WebSockets
+ Qt::WebSocketsPrivate
)
#### Keys ignored in scope 1:.:.:websocketframe.pro:<TRUE>:
diff --git a/tests/auto/websockets/websocketprotocol/CMakeLists.txt b/tests/auto/websockets/websocketprotocol/CMakeLists.txt
index cd559b4..978f16e 100644
--- a/tests/auto/websockets/websocketprotocol/CMakeLists.txt
+++ b/tests/auto/websockets/websocketprotocol/CMakeLists.txt
@@ -11,10 +11,8 @@ endif()
qt_add_test(tst_websocketprotocol
SOURCES
tst_websocketprotocol.cpp
- LIBRARIES
- Qt::WebSocketsPrivate
PUBLIC_LIBRARIES
- Qt::WebSockets
+ Qt::WebSocketsPrivate
)
#### Keys ignored in scope 1:.:.:websocketprotocol.pro:<TRUE>: