diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 16:32:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 14:40:28 +0000 |
| commit | 432b75517cba65e8ab633a2fe0d53f18abd59426 (patch) | |
| tree | 2ba828e91dc228237e63a346c0ab7bc09fde83c5 /examples | |
| parent | 5feeb5867d032cc4641ee088cfa5bd9063bcf5cd (diff) | |
| download | qtwebsockets-432b75517cba65e8ab633a2fe0d53f18abd59426.tar.gz | |
Regenerate before merge
Change-Id: I9f22f5d050aeec3e8c308e286a897f0f524ed8e3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples')
7 files changed, 13 insertions, 13 deletions
diff --git a/examples/websockets/echoclient/CMakeLists.txt b/examples/websockets/echoclient/CMakeLists.txt index ae0df62..aab7d04 100644 --- a/examples/websockets/echoclient/CMakeLists.txt +++ b/examples/websockets/echoclient/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/websockets/echoclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS WebSockets) diff --git a/examples/websockets/echoserver/CMakeLists.txt b/examples/websockets/echoserver/CMakeLists.txt index 3b7e3ce..c55296f 100644 --- a/examples/websockets/echoserver/CMakeLists.txt +++ b/examples/websockets/echoserver/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/websockets/echoserver") find_package(Qt6 COMPONENTS WebSockets) diff --git a/examples/websockets/qmlwebsocketclient/CMakeLists.txt b/examples/websockets/qmlwebsocketclient/CMakeLists.txt index bad5143..306e871 100644 --- a/examples/websockets/qmlwebsocketclient/CMakeLists.txt +++ b/examples/websockets/qmlwebsocketclient/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/websockets/qmlwebsocketclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,19 +26,19 @@ target_link_libraries(qmlwebsocketclient PUBLIC Qt::WebSockets ) + # Resources: set(data_resource_files "qml/qmlwebsocketclient/main.qml" ) -QT6_ADD_RESOURCES(qmlwebsocketclient "data" +qt6_add_resources(qmlwebsocketclient "data" PREFIX "/" FILES ${data_resource_files} ) - install(TARGETS qmlwebsocketclient RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/websockets/qmlwebsocketserver/CMakeLists.txt b/examples/websockets/qmlwebsocketserver/CMakeLists.txt index f7a196b..8f94a16 100644 --- a/examples/websockets/qmlwebsocketserver/CMakeLists.txt +++ b/examples/websockets/qmlwebsocketserver/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/websockets/qmlwebsocketserver") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,19 +26,19 @@ target_link_libraries(qmlwebsocketserver PUBLIC Qt::WebSockets ) + # Resources: set(data_resource_files "qml/qmlwebsocketserver/main.qml" ) -QT6_ADD_RESOURCES(qmlwebsocketserver "data" +qt6_add_resources(qmlwebsocketserver "data" PREFIX "/" FILES ${data_resource_files} ) - install(TARGETS qmlwebsocketserver RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/websockets/simplechat/CMakeLists.txt b/examples/websockets/simplechat/CMakeLists.txt index 367913f..a5240cb 100644 --- a/examples/websockets/simplechat/CMakeLists.txt +++ b/examples/websockets/simplechat/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/websockets/simplechat") find_package(Qt6 COMPONENTS WebSockets) diff --git a/examples/websockets/sslechoclient/CMakeLists.txt b/examples/websockets/sslechoclient/CMakeLists.txt index 039619c..8ba1c8b 100644 --- a/examples/websockets/sslechoclient/CMakeLists.txt +++ b/examples/websockets/sslechoclient/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/websockets/sslechoclient") find_package(Qt6 COMPONENTS WebSockets) diff --git a/examples/websockets/sslechoserver/CMakeLists.txt b/examples/websockets/sslechoserver/CMakeLists.txt index 788aa6d..a196388 100644 --- a/examples/websockets/sslechoserver/CMakeLists.txt +++ b/examples/websockets/sslechoserver/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/websockets/sslechoserver") find_package(Qt6 COMPONENTS WebSockets) @@ -21,20 +21,20 @@ target_link_libraries(sslechoserver PUBLIC Qt::WebSockets ) + # Resources: set(securesocketclient_resource_files "localhost.cert" "localhost.key" ) -QT6_ADD_RESOURCES(sslechoserver "securesocketclient" +qt6_add_resources(sslechoserver "securesocketclient" PREFIX "/" FILES ${securesocketclient_resource_files} ) - install(TARGETS sslechoserver RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" |