diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-18 19:22:12 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-19 08:39:21 +0100 |
commit | b789cfdd4fb7a833e426072393a4cb23328a1641 (patch) | |
tree | 459476f5c8399491b50b6f43e22f5ea3303e3cd2 /examples | |
parent | 908e924b9eee862aa9e1cf1515562fc9104117d6 (diff) |
Re-generate all CMake files
Change-Id: I40dd28da4ba47bd15471b471138900cd22b4e409
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'examples')
32 files changed, 271 insertions, 62 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index a739b11..6d5cc84 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -5,5 +5,8 @@ qt_examples_build_begin() if(TARGET Qt::Scxml) add_subdirectory(scxml) endif() +if(TARGET Qt::StateMachine) + add_subdirectory(widgets) +endif() qt_examples_build_end() diff --git a/examples/scxml/calculator-qml/CMakeLists.txt b/examples/scxml/calculator-qml/CMakeLists.txt index 5b20f47..62e9958 100644 --- a/examples/scxml/calculator-qml/CMakeLists.txt +++ b/examples/scxml/calculator-qml/CMakeLists.txt @@ -9,16 +9,24 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/calculator-qml") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/calculator-qml") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(calculator-qml +qt_add_executable(calculator-qml calculator-qml.cpp ) +set_target_properties(calculator-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(calculator-qml PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/calculator-widgets/CMakeLists.txt b/examples/scxml/calculator-widgets/CMakeLists.txt index 6c3b421..70d2324 100644 --- a/examples/scxml/calculator-widgets/CMakeLists.txt +++ b/examples/scxml/calculator-widgets/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/calculator-widgets") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/calculator-widgets") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(calculator-widgets +qt_add_executable(calculator-widgets calculator-widgets.cpp mainwindow.cpp mainwindow.h mainwindow.ui ) +set_target_properties(calculator-widgets PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(calculator-widgets PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/ftpclient/CMakeLists.txt b/examples/scxml/ftpclient/CMakeLists.txt index 15fa445..6ddea9e 100644 --- a/examples/scxml/ftpclient/CMakeLists.txt +++ b/examples/scxml/ftpclient/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/ftpclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/ftpclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Scxml) find_package(Qt6 COMPONENTS Network) -add_qt_gui_executable(ftpclient +qt_add_executable(ftpclient ftpcontrolchannel.cpp ftpcontrolchannel.h ftpdatachannel.cpp ftpdatachannel.h main.cpp ) +set_target_properties(ftpclient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(ftpclient PUBLIC Qt::Core Qt::Network diff --git a/examples/scxml/invoke-dynamic/CMakeLists.txt b/examples/scxml/invoke-dynamic/CMakeLists.txt index 9bf520d..b1a7fd7 100644 --- a/examples/scxml/invoke-dynamic/CMakeLists.txt +++ b/examples/scxml/invoke-dynamic/CMakeLists.txt @@ -9,16 +9,24 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/invoke-dynamic") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/invoke-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(invoke-dynamic +qt_add_executable(invoke-dynamic invoke-dynamic.cpp ) +set_target_properties(invoke-dynamic PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(invoke-dynamic PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/invoke-static/CMakeLists.txt b/examples/scxml/invoke-static/CMakeLists.txt index e94a208..93cbda9 100644 --- a/examples/scxml/invoke-static/CMakeLists.txt +++ b/examples/scxml/invoke-static/CMakeLists.txt @@ -9,16 +9,24 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/invoke-static") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/invoke-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(invoke-static +qt_add_executable(invoke-static invoke-static.cpp ) +set_target_properties(invoke-static PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(invoke-static PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt b/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt index cb99f9b..91f14fb 100644 --- a/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-qml-cppdatamodel") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/mediaplayer-qml-cppdatamodel") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(mediaplayer-qml-cppdatamodel +qt_add_executable(mediaplayer-qml-cppdatamodel mediaplayer-qml-cppdatamodel.cpp thedatamodel.cpp thedatamodel.h ) +set_target_properties(mediaplayer-qml-cppdatamodel PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(mediaplayer-qml-cppdatamodel PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt b/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt index 0fbf85e..910e20d 100644 --- a/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt +++ b/examples/scxml/mediaplayer-qml-dynamic/CMakeLists.txt @@ -9,16 +9,24 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-qml-dynamic") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/mediaplayer-qml-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(mediaplayer-qml-dynamic +qt_add_executable(mediaplayer-qml-dynamic mediaplayer-qml-dynamic.cpp ) +set_target_properties(mediaplayer-qml-dynamic PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(mediaplayer-qml-dynamic PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/mediaplayer-qml-static/CMakeLists.txt b/examples/scxml/mediaplayer-qml-static/CMakeLists.txt index 164c910..34306e5 100644 --- a/examples/scxml/mediaplayer-qml-static/CMakeLists.txt +++ b/examples/scxml/mediaplayer-qml-static/CMakeLists.txt @@ -9,16 +9,24 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-qml-static") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/mediaplayer-qml-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(mediaplayer-qml-static +qt_add_executable(mediaplayer-qml-static mediaplayer-qml-static.cpp ) +set_target_properties(mediaplayer-qml-static PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(mediaplayer-qml-static PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt b/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt index 93143f9..775142a 100644 --- a/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt +++ b/examples/scxml/mediaplayer-widgets-dynamic/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-widgets-dynamic") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/mediaplayer-widgets-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(mediaplayer-widgets-dynamic +qt_add_executable(mediaplayer-widgets-dynamic ../mediaplayer-common/mainwindow.cpp ../mediaplayer-common/mainwindow.h ../mediaplayer-common/mainwindow.ui mediaplayer-widgets-dynamic.cpp ) +set_target_properties(mediaplayer-widgets-dynamic PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(mediaplayer-widgets-dynamic PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt b/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt index 276ff15..e143592 100644 --- a/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt +++ b/examples/scxml/mediaplayer-widgets-static/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/mediaplayer-widgets-static") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/mediaplayer-widgets-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(mediaplayer-widgets-static +qt_add_executable(mediaplayer-widgets-static ../mediaplayer-common/mainwindow.cpp ../mediaplayer-common/mainwindow.h ../mediaplayer-common/mainwindow.ui mediaplayer-widgets-static.cpp ) +set_target_properties(mediaplayer-widgets-static PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(mediaplayer-widgets-static PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/pinball/CMakeLists.txt b/examples/scxml/pinball/CMakeLists.txt index 6e5daad..70511dc 100644 --- a/examples/scxml/pinball/CMakeLists.txt +++ b/examples/scxml/pinball/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/pinball") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/pinball") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(pinball +qt_add_executable(pinball main.cpp mainwindow.cpp mainwindow.h mainwindow.ui ) +set_target_properties(pinball PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(pinball PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/sudoku/CMakeLists.txt b/examples/scxml/sudoku/CMakeLists.txt index 9816b39..b9a9f6d 100644 --- a/examples/scxml/sudoku/CMakeLists.txt +++ b/examples/scxml/sudoku/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/sudoku") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/sudoku") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(sudoku +qt_add_executable(sudoku main.cpp mainwindow.cpp mainwindow.h ) +set_target_properties(sudoku PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(sudoku PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt b/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt index 8fc3777..20ab198 100644 --- a/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt +++ b/examples/scxml/trafficlight-qml-dynamic/CMakeLists.txt @@ -9,16 +9,24 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-qml-dynamic") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/trafficlight-qml-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(trafficlight-qml-dynamic +qt_add_executable(trafficlight-qml-dynamic trafficlight-qml-dynamic.cpp ) +set_target_properties(trafficlight-qml-dynamic PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(trafficlight-qml-dynamic PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/trafficlight-qml-simple/CMakeLists.txt b/examples/scxml/trafficlight-qml-simple/CMakeLists.txt index 8d82550..6f177db 100644 --- a/examples/scxml/trafficlight-qml-simple/CMakeLists.txt +++ b/examples/scxml/trafficlight-qml-simple/CMakeLists.txt @@ -9,16 +9,24 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-qml-simple") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/trafficlight-qml-simple") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(trafficlight-qml-simple +qt_add_executable(trafficlight-qml-simple trafficlight-qml-simple.cpp ) +set_target_properties(trafficlight-qml-simple PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(trafficlight-qml-simple PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/trafficlight-qml-static/CMakeLists.txt b/examples/scxml/trafficlight-qml-static/CMakeLists.txt index a056d7d..a61e14e 100644 --- a/examples/scxml/trafficlight-qml-static/CMakeLists.txt +++ b/examples/scxml/trafficlight-qml-static/CMakeLists.txt @@ -9,16 +9,24 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-qml-static") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/trafficlight-qml-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(trafficlight-qml-static +qt_add_executable(trafficlight-qml-static trafficlight-qml-static.cpp ) +set_target_properties(trafficlight-qml-static PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(trafficlight-qml-static PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt b/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt index c78fda8..1cdd7e6 100644 --- a/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt +++ b/examples/scxml/trafficlight-widgets-dynamic/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-widgets-dynamic") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/trafficlight-widgets-dynamic") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(trafficlight-widgets-dynamic +qt_add_executable(trafficlight-widgets-dynamic ../trafficlight-common/trafficlight.cpp ../trafficlight-common/trafficlight.h trafficlight-widgets-dynamic.cpp ) +set_target_properties(trafficlight-widgets-dynamic PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(trafficlight-widgets-dynamic PUBLIC Qt::Core Qt::Gui diff --git a/examples/scxml/trafficlight-widgets-static/CMakeLists.txt b/examples/scxml/trafficlight-widgets-static/CMakeLists.txt index 9faa711..e6a4aa2 100644 --- a/examples/scxml/trafficlight-widgets-static/CMakeLists.txt +++ b/examples/scxml/trafficlight-widgets-static/CMakeLists.txt @@ -9,17 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/scxml/trafficlight-widgets-static") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/trafficlight-widgets-static") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS Scxml) -add_qt_gui_executable(trafficlight-widgets-static +qt_add_executable(trafficlight-widgets-static ../trafficlight-common/trafficlight.cpp ../trafficlight-common/trafficlight.h trafficlight-widgets-static.cpp ) +set_target_properties(trafficlight-widgets-static PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(trafficlight-widgets-static PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/animation/animatedtiles/CMakeLists.txt b/examples/widgets/animation/animatedtiles/CMakeLists.txt index 351926b..af44044 100644 --- a/examples/widgets/animation/animatedtiles/CMakeLists.txt +++ b/examples/widgets/animation/animatedtiles/CMakeLists.txt @@ -17,16 +17,21 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/animation/animatedtiles") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(animatedtiles +qt_add_executable(animatedtiles main.cpp ) +set_target_properties(animatedtiles PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(animatedtiles PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) diff --git a/examples/widgets/animation/moveblocks/CMakeLists.txt b/examples/widgets/animation/moveblocks/CMakeLists.txt index d531f9f..0a23e50 100644 --- a/examples/widgets/animation/moveblocks/CMakeLists.txt +++ b/examples/widgets/animation/moveblocks/CMakeLists.txt @@ -17,16 +17,21 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/animation/moveblocks") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(moveblocks +qt_add_executable(moveblocks main.cpp ) +set_target_properties(moveblocks PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(moveblocks PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) install(TARGETS moveblocks diff --git a/examples/widgets/animation/states/CMakeLists.txt b/examples/widgets/animation/states/CMakeLists.txt index 7050edb..26f3192 100644 --- a/examples/widgets/animation/states/CMakeLists.txt +++ b/examples/widgets/animation/states/CMakeLists.txt @@ -17,16 +17,21 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/animation/states") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(states +qt_add_executable(states main.cpp ) +set_target_properties(states PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(states PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) diff --git a/examples/widgets/animation/stickman/CMakeLists.txt b/examples/widgets/animation/stickman/CMakeLists.txt index dbf49e4..0b0134b 100644 --- a/examples/widgets/animation/stickman/CMakeLists.txt +++ b/examples/widgets/animation/stickman/CMakeLists.txt @@ -17,9 +17,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/animation/stickman") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(stickman +qt_add_executable(stickman animation.cpp animation.h graphicsview.cpp graphicsview.h lifecycle.cpp lifecycle.h @@ -28,11 +29,15 @@ add_qt_gui_executable(stickman rectbutton.cpp rectbutton.h stickman.cpp stickman.h ) +set_target_properties(stickman PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(stickman PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) diff --git a/examples/widgets/animation/sub-attaq/.prev_CMakeLists.txt b/examples/widgets/animation/sub-attaq/.prev_CMakeLists.txt index 4077a91..1e6dc8a 100644 --- a/examples/widgets/animation/sub-attaq/.prev_CMakeLists.txt +++ b/examples/widgets/animation/sub-attaq/.prev_CMakeLists.txt @@ -17,9 +17,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/animation/sub-attaq") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(sub-attaq +qt_add_executable(sub-attaq animationmanager.cpp animationmanager.h boat.cpp boat.h boat_p.h bomb.cpp bomb.h @@ -34,11 +35,15 @@ add_qt_gui_executable(sub-attaq textinformationitem.cpp textinformationitem.h torpedo.cpp torpedo.h ) +set_target_properties(sub-attaq PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(sub-attaq PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) diff --git a/examples/widgets/animation/sub-attaq/CMakeLists.txt b/examples/widgets/animation/sub-attaq/CMakeLists.txt index 00e5df5..9356de1 100644 --- a/examples/widgets/animation/sub-attaq/CMakeLists.txt +++ b/examples/widgets/animation/sub-attaq/CMakeLists.txt @@ -17,10 +17,11 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/animation/sub-attaq") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS OpenGL) # special case -add_qt_gui_executable(sub-attaq +qt_add_executable(sub-attaq animationmanager.cpp animationmanager.h boat.cpp boat.h boat_p.h bomb.cpp bomb.h @@ -35,11 +36,15 @@ add_qt_gui_executable(sub-attaq textinformationitem.cpp textinformationitem.h torpedo.cpp torpedo.h ) +set_target_properties(sub-attaq PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(sub-attaq PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) diff --git a/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt index 514b893..056dbf6 100644 --- a/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt +++ b/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt @@ -17,9 +17,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/graphicsview/padnavigator find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_executable(padnavigator +qt_add_executable(padnavigator flippablepad.cpp flippablepad.h form.ui main.cpp @@ -27,11 +28,15 @@ add_executable(padnavigator roundrectitem.cpp roundrectitem.h splashitem.cpp splashitem.h ) +set_target_properties(padnavigator PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE TRUE +) target_link_libraries(padnavigator PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) diff --git a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt index b024350..2dce7f4 100644 --- a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt +++ b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt @@ -17,10 +17,11 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/graphicsview/padnavigator find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS OpenGL) # special case -add_executable(padnavigator +qt_add_executable(padnavigator flippablepad.cpp flippablepad.h form.ui main.cpp @@ -28,11 +29,15 @@ add_executable(padnavigator roundrectitem.cpp roundrectitem.h splashitem.cpp splashitem.h ) +set_target_properties(padnavigator PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE TRUE +) target_link_libraries(padnavigator PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) diff --git a/examples/widgets/statemachine/eventtransitions/CMakeLists.txt b/examples/widgets/statemachine/eventtransitions/CMakeLists.txt index eeb2223..e3396c7 100644 --- a/examples/widgets/statemachine/eventtransitions/CMakeLists.txt +++ b/examples/widgets/statemachine/eventtransitions/CMakeLists.txt @@ -17,16 +17,21 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/eventtransit find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(eventtransitions +qt_add_executable(eventtransitions main.cpp ) +set_target_properties(eventtransitions PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(eventtransitions PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) install(TARGETS eventtransitions diff --git a/examples/widgets/statemachine/factorial/CMakeLists.txt b/examples/widgets/statemachine/factorial/CMakeLists.txt index 9f0e9ce..5a5e7c5 100644 --- a/examples/widgets/statemachine/factorial/CMakeLists.txt +++ b/examples/widgets/statemachine/factorial/CMakeLists.txt @@ -16,13 +16,18 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/factorial") find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS StateMachine) -add_executable(factorial +qt_add_executable(factorial main.cpp ) +set_target_properties(factorial PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(factorial PUBLIC Qt::Core - statemachine + Qt::StateMachine ) install(TARGETS factorial diff --git a/examples/widgets/statemachine/pingpong/CMakeLists.txt b/examples/widgets/statemachine/pingpong/CMakeLists.txt index 3ad02b9..df2c6f3 100644 --- a/examples/widgets/statemachine/pingpong/CMakeLists.txt +++ b/examples/widgets/statemachine/pingpong/CMakeLists.txt @@ -15,14 +15,19 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/pingpong") +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Core) -add_executable(pingpong +qt_add_executable(pingpong main.cpp ) +set_target_properties(pingpong PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(pingpong PUBLIC Qt::Core - statemachine + Qt::StateMachine ) install(TARGETS pingpong diff --git a/examples/widgets/statemachine/rogue/CMakeLists.txt b/examples/widgets/statemachine/rogue/CMakeLists.txt index 5f183a3..712626a 100644 --- a/examples/widgets/statemachine/rogue/CMakeLists.txt +++ b/examples/widgets/statemachine/rogue/CMakeLists.txt @@ -17,18 +17,23 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/rogue") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(rogue +qt_add_executable(rogue main.cpp movementtransition.h window.cpp window.h ) +set_target_properties(rogue PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(rogue PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) install(TARGETS rogue diff --git a/examples/widgets/statemachine/trafficlight/CMakeLists.txt b/examples/widgets/statemachine/trafficlight/CMakeLists.txt index f1c618c..1512c0a 100644 --- a/examples/widgets/statemachine/trafficlight/CMakeLists.txt +++ b/examples/widgets/statemachine/trafficlight/CMakeLists.txt @@ -17,16 +17,21 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/trafficlight find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(trafficlight +qt_add_executable(trafficlight main.cpp ) +set_target_properties(trafficlight PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(trafficlight PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) install(TARGETS trafficlight diff --git a/examples/widgets/statemachine/twowaybutton/CMakeLists.txt b/examples/widgets/statemachine/twowaybutton/CMakeLists.txt index f989f5e..bedfeef 100644 --- a/examples/widgets/statemachine/twowaybutton/CMakeLists.txt +++ b/examples/widgets/statemachine/twowaybutton/CMakeLists.txt @@ -17,16 +17,21 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/twowaybutton find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS StateMachine) find_package(Qt6 COMPONENTS Widgets) -add_qt_gui_executable(twowaybutton +qt_add_executable(twowaybutton main.cpp ) +set_target_properties(twowaybutton PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(twowaybutton PUBLIC Qt::Core Qt::Gui + Qt::StateMachine Qt::Widgets - statemachine ) install(TARGETS twowaybutton |