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 | |
| parent | 908e924b9eee862aa9e1cf1515562fc9104117d6 (diff) | |
Re-generate all CMake files
Change-Id: I40dd28da4ba47bd15471b471138900cd22b4e409
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
64 files changed, 482 insertions, 92 deletions
diff --git a/.cmake.conf b/.cmake.conf new file mode 100644 index 0000000..213991f --- /dev/null +++ b/.cmake.conf @@ -0,0 +1 @@ +set(QT_REPO_MODULE_VERSION "6.1.0") diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt index b6a05b5..bb8c3da 100644 --- a/.prev_CMakeLists.txt +++ b/.prev_CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(QtScxml - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt Scxml Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C diff --git a/CMakeLists.txt b/CMakeLists.txt index ed52112..a121516 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(QtScxml - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt Scxml Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C 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 diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake new file mode 100644 index 0000000..94d4e98 --- /dev/null +++ b/qt_cmdline.cmake @@ -0,0 +1,2 @@ +qt_commandline_subconfig(src/scxml) +qt_commandline_subconfig(src/statemachine) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0e4e3bb..1c98c3e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ # Generated from src.pro. add_subdirectory(scxml) +add_subdirectory(statemachine) if(TARGET Qt::Qml) add_subdirectory(imports) endif() diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt index 805a479..0c4a585 100644 --- a/src/imports/CMakeLists.txt +++ b/src/imports/CMakeLists.txt @@ -1,3 +1,4 @@ # Generated from imports.pro. add_subdirectory(scxmlstatemachine) +add_subdirectory(statemachine) diff --git a/src/imports/scxmlstatemachine/.prev_CMakeLists.txt b/src/imports/scxmlstatemachine/.prev_CMakeLists.txt index 40bb2aa..ddd0877 100644 --- a/src/imports/scxmlstatemachine/.prev_CMakeLists.txt +++ b/src/imports/scxmlstatemachine/.prev_CMakeLists.txt @@ -15,12 +15,9 @@ qt_add_qml_module(scxml plugin.cpp statemachineextended.cpp statemachineextended_p.h statemachineloader.cpp statemachineloader_p.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Qml Qt::Scxml ) diff --git a/src/imports/scxmlstatemachine/CMakeLists.txt b/src/imports/scxmlstatemachine/CMakeLists.txt index f0218cd..fd75975 100644 --- a/src/imports/scxmlstatemachine/CMakeLists.txt +++ b/src/imports/scxmlstatemachine/CMakeLists.txt @@ -15,12 +15,9 @@ qt_add_qml_module(declarative_scxml # special case plugin.cpp statemachineextended.cpp statemachineextended_p.h statemachineloader.cpp statemachineloader_p.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Qml Qt::Scxml ) diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt index 232f3f2..2f33242 100644 --- a/src/imports/statemachine/CMakeLists.txt +++ b/src/imports/statemachine/CMakeLists.txt @@ -10,6 +10,7 @@ qt_add_qml_module(qtqmlstatemachine CLASSNAME QtQmlStateMachinePlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES + INSTALL_QMLTYPES SOURCES childrenprivate.h finalstate.cpp finalstate.h @@ -22,6 +23,7 @@ qt_add_qml_module(qtqmlstatemachine PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate + Qt::StateMachine ) #### Keys ignored in scope 1:.:.:statemachine.pro:<TRUE>: diff --git a/src/scxml/.prev_CMakeLists.txt b/src/scxml/.prev_CMakeLists.txt index 7b9c22f..37fe52b 100644 --- a/src/scxml/.prev_CMakeLists.txt +++ b/src/scxml/.prev_CMakeLists.txt @@ -26,6 +26,8 @@ qt_add_module(Scxml Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:scxml.pro:<TRUE>: @@ -46,6 +48,8 @@ qt_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Qml + PRIVATE_MODULE_INTERFACE + Qt::QmlPrivate ) #### Keys ignored in scope 3:.:.:scxml.pro:NOT force_independent AND ( NOT debug_and_release OR NOT build_all OR CONFIG(release,debug OR release) ): diff --git a/src/scxml/CMakeLists.txt b/src/scxml/CMakeLists.txt index 9b686e6..0851f29 100644 --- a/src/scxml/CMakeLists.txt +++ b/src/scxml/CMakeLists.txt @@ -26,6 +26,8 @@ qt_add_module(Scxml Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:scxml.pro:<TRUE>: @@ -46,6 +48,8 @@ qt_extend_target(Scxml CONDITION QT_FEATURE_scxml_ecmascriptdatamodel Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Qml + PRIVATE_MODULE_INTERFACE + Qt::QmlPrivate ) #### Keys ignored in scope 3:.:.:scxml.pro:NOT force_independent AND ( NOT debug_and_release OR NOT build_all OR CONFIG(release,debug OR release) ): diff --git a/src/scxml/configure.cmake b/src/scxml/configure.cmake index 40cc67a..5629eb9 100644 --- a/src/scxml/configure.cmake +++ b/src/scxml/configure.cmake @@ -14,8 +14,11 @@ #### Features -qt_feature("scxml_ecmascriptdatamodel" PUBLIC +qt_feature("scxml-ecmascriptdatamodel" PUBLIC SECTION "SCXML" LABEL "ECMAScript data model for QtScxml" PURPOSE "Enables the usage of ecmascript data models in SCXML state machines." ) +qt_configure_add_summary_section(NAME "Qt Scxml") +qt_configure_add_summary_entry(ARGS "scxml-ecmascriptdatamodel") +qt_configure_end_summary_section() # end of "Qt Scxml" section diff --git a/src/scxml/qt_cmdline.cmake b/src/scxml/qt_cmdline.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/scxml/qt_cmdline.cmake diff --git a/src/statemachine/CMakeLists.txt b/src/statemachine/CMakeLists.txt new file mode 100644 index 0000000..49639c3 --- /dev/null +++ b/src/statemachine/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from statemachine.pro. + +##################################################################### +## StateMachine Module: +##################################################################### + +qt_add_module(StateMachine + SOURCES + qabstractstate.cpp qabstractstate.h qabstractstate_p.h + qabstracttransition.cpp qabstracttransition.h qabstracttransition_p.h + qfinalstate.cpp qfinalstate.h qfinalstate_p.h + qhistorystate.cpp qhistorystate.h qhistorystate_p.h + qsignaleventgenerator_p.h + qsignaltransition.cpp qsignaltransition.h qsignaltransition_p.h + qstate.cpp qstate.h qstate_p.h + qstatemachine.cpp qstatemachine.h qstatemachine_p.h + qstatemachineglobal.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES + Qt::CorePrivate + PUBLIC_LIBRARIES + Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate +) + +## Scopes: +##################################################################### + +qt_extend_target(StateMachine CONDITION QT_FEATURE_qeventtransition + SOURCES + gui/qbasickeyeventtransition.cpp gui/qbasickeyeventtransition_p.h + gui/qbasicmouseeventtransition.cpp gui/qbasicmouseeventtransition_p.h + gui/qkeyeventtransition.cpp gui/qkeyeventtransition.h + gui/qmouseeventtransition.cpp gui/qmouseeventtransition.h + qeventtransition.cpp qeventtransition.h qeventtransition_p.h + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui + PRIVATE_MODULE_INTERFACE + Qt::GuiPrivate +) diff --git a/src/statemachine/configure.cmake b/src/statemachine/configure.cmake new file mode 100644 index 0000000..f759b4b --- /dev/null +++ b/src/statemachine/configure.cmake @@ -0,0 +1,26 @@ + + +#### Inputs + + + +#### Libraries + + + +#### Tests + + + +#### Features + +qt_feature("statemachine" PUBLIC + SECTION "Utilities" + LABEL "State machine" + PURPOSE "Provides hierarchical finite state machines." +) +qt_feature_definition("statemachine" "QT_NO_STATEMACHINE" NEGATE VALUE "1") +qt_feature("qeventtransition" PUBLIC + LABEL "QEventTransition class" + CONDITION QT_FEATURE_statemachine +) diff --git a/src/statemachine/qt_cmdline.cmake b/src/statemachine/qt_cmdline.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/statemachine/qt_cmdline.cmake diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt index f9ace95..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(QtScxmlTests 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 b241c6e..62f6731 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,8 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. cmake_minimum_required(VERSION 3.15.0) project(QtScxmlTests VERSION 6.0.0 LANGUAGES C CXX) find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Scxml Test) # special case diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt index dd9caab..4b560c5 100644 --- a/tests/auto/.prev_CMakeLists.txt +++ b/tests/auto/.prev_CMakeLists.txt @@ -7,3 +7,8 @@ add_subdirectory(parser) add_subdirectory(scion) add_subdirectory(statemachine) add_subdirectory(statemachineinfo) +add_subdirectory(qml) +add_subdirectory(qmltest) +if(NOT UIKIT) + add_subdirectory(qstatemachine) +endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 1666cfd..bc13ede 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -9,3 +9,8 @@ add_subdirectory(parser) add_subdirectory(scion) add_subdirectory(statemachine) add_subdirectory(statemachineinfo) +add_subdirectory(qml) +add_subdirectory(qmltest) +if(NOT UIKIT) + add_subdirectory(qstatemachine) +endif() diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt new file mode 100644 index 0000000..637b45a --- /dev/null +++ b/tests/auto/qml/CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from qml.pro. + +add_subdirectory(qqmlstatemachine) +add_subdirectory(qqmlmetatype) diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt index 032fe84..8188bdf 100644 --- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt +++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt @@ -12,5 +12,7 @@ qt_add_test(tst_qqmlmetatype Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - TESTDATA ${test_data} ) + +## Scopes: +##################################################################### diff --git a/tests/auto/qmltest/CMakeLists.txt b/tests/auto/qmltest/CMakeLists.txt new file mode 100644 index 0000000..3dc534f --- /dev/null +++ b/tests/auto/qmltest/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from qmltest.pro. + +add_subdirectory(statemachine) diff --git a/tests/auto/qstatemachine/CMakeLists.txt b/tests/auto/qstatemachine/CMakeLists.txt new file mode 100644 index 0000000..96d6437 --- /dev/null +++ b/tests/auto/qstatemachine/CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from qstatemachine.pro. + +add_subdirectory(qstate) +add_subdirectory(qstatemachine) diff --git a/tests/auto/qstatemachine/qstate/CMakeLists.txt b/tests/auto/qstatemachine/qstate/CMakeLists.txt new file mode 100644 index 0000000..927325b --- /dev/null +++ b/tests/auto/qstatemachine/qstate/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qstate.pro. + +##################################################################### +## tst_qstate Test: +##################################################################### + +qt_add_test(tst_qstate + SOURCES + tst_qstate.cpp + PUBLIC_LIBRARIES + Qt::StateMachine +) diff --git a/tests/auto/qstatemachine/qstatemachine/CMakeLists.txt b/tests/auto/qstatemachine/qstatemachine/CMakeLists.txt new file mode 100644 index 0000000..7c1e605 --- /dev/null +++ b/tests/auto/qstatemachine/qstatemachine/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qstatemachine.pro. + +##################################################################### +## tst_qstatemachine Test: +##################################################################### + +qt_add_test(tst_qstatemachine + SOURCES + tst_qstatemachine.cpp + PUBLIC_LIBRARIES + Qt::StateMachine + Qt::StateMachinePrivate +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qstatemachine CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) diff --git a/tests/auto/statemachine/CMakeLists.txt b/tests/auto/statemachine/CMakeLists.txt index 458ada3..9f31b09 100644 --- a/tests/auto/statemachine/CMakeLists.txt +++ b/tests/auto/statemachine/CMakeLists.txt @@ -7,12 +7,10 @@ qt_add_test(tst_statemachine SOURCES tst_statemachine.cpp - LIBRARIES - Qt::ScxmlPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml - Qt::Scxml + Qt::ScxmlPrivate ) # Resources: diff --git a/tests/auto/statemachineinfo/CMakeLists.txt b/tests/auto/statemachineinfo/CMakeLists.txt index ea1bae0..c708b39 100644 --- a/tests/auto/statemachineinfo/CMakeLists.txt +++ b/tests/auto/statemachineinfo/CMakeLists.txt @@ -7,12 +7,10 @@ qt_add_test(tst_statemachineinfo SOURCES tst_statemachineinfo.cpp - LIBRARIES - Qt::ScxmlPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml - Qt::Scxml + Qt::ScxmlPrivate ) # Resources: diff --git a/tests/manual/cppgen/CMakeLists.txt b/tests/manual/cppgen/CMakeLists.txt new file mode 100644 index 0000000..8584067 --- /dev/null +++ b/tests/manual/cppgen/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from cppgen.pro. + +##################################################################### +## tst_cppgen Tool: +##################################################################### + +qt_get_tool_target_name(target_name tst_cppgen) +qt_add_tool(${target_name} + SOURCES + tst_cppgen.cpp + PUBLIC_LIBRARIES + Qt::Qml + Qt::Scxml + Qt::Test +) + +#### Keys ignored in scope 1:.:.:cppgen.pro:<TRUE>: +# TEMPLATE = "app" +# _OPTION = "host_build" diff --git a/tests/manual/testCpp/CMakeLists.txt b/tests/manual/testCpp/CMakeLists.txt new file mode 100644 index 0000000..c7875c7 --- /dev/null +++ b/tests/manual/testCpp/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from testCpp.pro. + +##################################################################### +## testCpp Tool: +##################################################################### + +qt_get_tool_target_name(target_name testCpp) +qt_add_tool(${target_name} + SOURCES + testcpp.cpp + PUBLIC_LIBRARIES + Qt::Qml + Qt::Scxml +) + +# Statecharts: +add_qt_statecharts(testCpp FILES + out.scxml +) + +#### Keys ignored in scope 1:.:.:testCpp.pro:<TRUE>: +# OTHER_FILES = "genTestSxcml.py" "out.scxml" +# TEMPLATE = "app" +# _OPTION = "host_build" diff --git a/tools/qscxmlc/.prev_CMakeLists.txt b/tools/qscxmlc/.prev_CMakeLists.txt index a1c65fc..eb2eab8 100644 --- a/tools/qscxmlc/.prev_CMakeLists.txt +++ b/tools/qscxmlc/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qscxmlc Tool: ##################################################################### -qt_add_tool(qscxmlc +qt_get_tool_target_name(target_name qscxmlc) +qt_add_tool(${target_name} SOURCES ../../src/scxml/qscxmlcompiler.cpp ../../src/scxml/qscxmlcompiler.h ../../src/scxml/qscxmlcompiler_p.h ../../src/scxml/qscxmlerror.cpp ../../src/scxml/qscxmlerror.h @@ -25,7 +26,7 @@ qt_add_tool(qscxmlc INCLUDE_DIRECTORIES .scxml.includes .scxml_private.includes - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) @@ -36,7 +37,7 @@ set(templates_resource_files "decl.t" ) -qt_add_resource(qscxmlc "templates" +qt_add_resource(${target_name} "templates" PREFIX "/" FILES diff --git a/tools/qscxmlc/CMakeLists.txt b/tools/qscxmlc/CMakeLists.txt index 5daaf26..23dc5d1 100644 --- a/tools/qscxmlc/CMakeLists.txt +++ b/tools/qscxmlc/CMakeLists.txt @@ -4,7 +4,8 @@ ## qscxmlc Tool: ##################################################################### -qt_add_tool(qscxmlc +qt_get_tool_target_name(target_name qscxmlc) +qt_add_tool(${target_name} TOOLS_TARGET Scxml # special case SOURCES ../../src/scxml/qscxmlcompiler.cpp ../../src/scxml/qscxmlcompiler.h ../../src/scxml/qscxmlcompiler_p.h @@ -44,7 +45,7 @@ set(templates_resource_files "decl.t" ) -qt_add_resource(qscxmlc "templates" +qt_add_resource(${target_name} "templates" PREFIX "/" FILES |