diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-12 17:05:31 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-15 11:28:28 +0100 |
| commit | 892dfeeff0fd3c17cfeb3cbb887f7a80e436aa17 (patch) | |
| tree | 0cab658cbe4a01a0f579d609d35c9646e6c04de9 /examples | |
| parent | e421f4b54d37ca6f685ba6ecbf89bd6f3fa53131 (diff) | |
Re-generate CMake project files
Change-Id: I7973833fa7b4000cb8f6e1a1fc0a8c560fe16a3b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/webchannel/chatserver-cpp/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | examples/webchannel/standalone/.prev_CMakeLists.txt | 12 | ||||
| -rw-r--r-- | examples/webchannel/standalone/CMakeLists.txt | 12 |
3 files changed, 30 insertions, 6 deletions
diff --git a/examples/webchannel/chatserver-cpp/CMakeLists.txt b/examples/webchannel/chatserver-cpp/CMakeLists.txt index 3a3a2c9..0bb0c6a 100644 --- a/examples/webchannel/chatserver-cpp/CMakeLists.txt +++ b/examples/webchannel/chatserver-cpp/CMakeLists.txt @@ -9,18 +9,26 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/webchannel/chatserver-cpp") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webchannel/chatserver-cpp") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS WebSockets) find_package(Qt6 COMPONENTS WebChannel) -add_executable(chatserver +qt_add_executable(chatserver ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h ../shared/websockettransport.cpp ../shared/websockettransport.h chatserver.cpp chatserver.h main.cpp ) +set_target_properties(chatserver PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE TRUE +) target_link_libraries(chatserver PUBLIC Qt::Core Qt::WebChannel diff --git a/examples/webchannel/standalone/.prev_CMakeLists.txt b/examples/webchannel/standalone/.prev_CMakeLists.txt index a170cb6..5ee4b27 100644 --- a/examples/webchannel/standalone/.prev_CMakeLists.txt +++ b/examples/webchannel/standalone/.prev_CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/webchannel/standalone") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webchannel/standalone") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -17,13 +21,17 @@ find_package(Qt6 COMPONENTS WebChannel) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS WebSockets) -add_qt_gui_executable(standalone +qt_add_executable(standalone ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h ../shared/websockettransport.cpp ../shared/websockettransport.h core.h dialog.cpp dialog.h dialog.ui main.cpp ) +set_target_properties(standalone PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_compile_definitions(standalone PUBLIC ${CMAKE_CURRENT_BINARY_DIR}"\\\"\"" BUILD_DIR="\" diff --git a/examples/webchannel/standalone/CMakeLists.txt b/examples/webchannel/standalone/CMakeLists.txt index 78977cd..ff085c5 100644 --- a/examples/webchannel/standalone/CMakeLists.txt +++ b/examples/webchannel/standalone/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/webchannel/standalone") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webchannel/standalone") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -17,13 +21,17 @@ find_package(Qt6 COMPONENTS WebChannel) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS WebSockets) -add_qt_gui_executable(standalone +qt_add_executable(standalone ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h ../shared/websockettransport.cpp ../shared/websockettransport.h core.h dialog.cpp dialog.h dialog.ui main.cpp ) +set_target_properties(standalone PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) # special case begin # pro2cmake generates invalid cmake syntax here target_compile_definitions(standalone PUBLIC |