diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-29 10:01:43 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-29 10:46:33 +0100 |
commit | 100d0d2ea35834d06c864a12d6f6829692c2d990 (patch) | |
tree | 46ff779cc1f52ec81b20ad54a5946445787eeaf5 /examples | |
parent | 52b61cd81dc5ea051e49dfe9f680b6fe4259555e (diff) | |
parent | 3c3d168487b10e7e4d7c06df5a28df9d4220b6de (diff) | |
download | qtwebchannel-100d0d2ea35834d06c864a12d6f6829692c2d990.tar.gz |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Regenerating and fixing as needed.
Fixes: QTBUG-90661
Change-Id: Ief9f044d4b9ea2ce8130b11031fb93b6e673fbdd
Diffstat (limited to 'examples')
-rw-r--r-- | examples/CMakeLists.txt | 7 | ||||
-rw-r--r-- | examples/webchannel/CMakeLists.txt | 18 | ||||
-rw-r--r-- | examples/webchannel/chatserver-cpp/CMakeLists.txt | 34 | ||||
-rw-r--r-- | examples/webchannel/standalone/.prev_CMakeLists.txt | 44 | ||||
-rw-r--r-- | examples/webchannel/standalone/CMakeLists.txt | 45 |
5 files changed, 148 insertions, 0 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 0000000..4138540 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from examples.pro. + +qt_examples_build_begin() + +add_subdirectory(webchannel) + +qt_examples_build_end() diff --git a/examples/webchannel/CMakeLists.txt b/examples/webchannel/CMakeLists.txt new file mode 100644 index 0000000..78c2fb6 --- /dev/null +++ b/examples/webchannel/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from webchannel.pro. + +# special case begin +# These are all TEMPLATE = aux +#add_subdirectory(nodejs) +#add_subdirectory(qwclient) +#add_subdirectory(chatclient-html) +# special case end +if(TARGET Qt::WebSockets) + add_subdirectory(chatserver-cpp) + # special case begin + # This one is TEMPLATE = aux too + #add_subdirectory(chatclient-qml) + # special case end +endif() +if(TARGET Qt::WebSockets AND TARGET Qt::Widgets) + add_subdirectory(standalone) +endif() diff --git a/examples/webchannel/chatserver-cpp/CMakeLists.txt b/examples/webchannel/chatserver-cpp/CMakeLists.txt new file mode 100644 index 0000000..3a3a2c9 --- /dev/null +++ b/examples/webchannel/chatserver-cpp/CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from chatserver-cpp.pro. + +cmake_minimum_required(VERSION 3.14) +project(chatserver LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/webchannel/chatserver-cpp") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS WebSockets) +find_package(Qt6 COMPONENTS WebChannel) + +add_executable(chatserver + ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h + ../shared/websockettransport.cpp ../shared/websockettransport.h + chatserver.cpp chatserver.h + main.cpp +) +target_link_libraries(chatserver PUBLIC + Qt::Core + Qt::WebChannel + Qt::WebSockets +) + +install(TARGETS chatserver + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/webchannel/standalone/.prev_CMakeLists.txt b/examples/webchannel/standalone/.prev_CMakeLists.txt new file mode 100644 index 0000000..a170cb6 --- /dev/null +++ b/examples/webchannel/standalone/.prev_CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from standalone.pro. + +cmake_minimum_required(VERSION 3.14) +project(standalone LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/webchannel/standalone") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS WebChannel) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS WebSockets) + +add_qt_gui_executable(standalone + ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h + ../shared/websockettransport.cpp ../shared/websockettransport.h + core.h + dialog.cpp dialog.h dialog.ui + main.cpp +) +target_compile_definitions(standalone PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}"\\\"\"" + BUILD_DIR="\" +) + +target_link_libraries(standalone PUBLIC + Qt::Core + Qt::Gui + Qt::WebChannel + Qt::WebSockets + Qt::Widgets +) + +install(TARGETS standalone + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/webchannel/standalone/CMakeLists.txt b/examples/webchannel/standalone/CMakeLists.txt new file mode 100644 index 0000000..78977cd --- /dev/null +++ b/examples/webchannel/standalone/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from standalone.pro. + +cmake_minimum_required(VERSION 3.14) +project(standalone LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/webchannel/standalone") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS WebChannel) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS WebSockets) + +add_qt_gui_executable(standalone + ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h + ../shared/websockettransport.cpp ../shared/websockettransport.h + core.h + dialog.cpp dialog.h dialog.ui + main.cpp +) +# special case begin +# pro2cmake generates invalid cmake syntax here +target_compile_definitions(standalone PUBLIC + "BUILD_DIR=\"${CMAKE_CURRENT_BINARY_DIR}\"" +) +# special case end +target_link_libraries(standalone PUBLIC + Qt::Core + Qt::Gui + Qt::WebChannel + Qt::WebSockets + Qt::Widgets +) + +install(TARGETS standalone + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) |