diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-02-27 17:48:37 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-02-28 09:20:21 +0100 |
| commit | 25ac4f53aecdbec02bd5f518c2d4f28a998070e0 (patch) | |
| tree | 7745fcf907863326f0dc34d56410a7fbe54d1165 | |
| parent | 15577301ed4544d8ffea906cd5468e693cc6f456 (diff) | |
Make the mediaplayer target name unique to avoid conflicts in top-level build
Rename the scxml 'mediaplayer' target to 'mediaplayerscxml'
Amends 1eb77736b2e72bfcbdc356e183e3cbb0f09d71a1
Task-number: QTBUG-111090
Pick-to: 6.5
Change-Id: I744624cb2b7547f03a8867b28f0301b1431b64c0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | examples/scxml/mediaplayer/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/scxml/mediaplayer/CMakeLists.txt b/examples/scxml/mediaplayer/CMakeLists.txt index 1a072c1..d4ddfe8 100644 --- a/examples/scxml/mediaplayer/CMakeLists.txt +++ b/examples/scxml/mediaplayer/CMakeLists.txt @@ -16,17 +16,17 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/mediaplayer") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Scxml) -qt_add_executable(mediaplayer +qt_add_executable(mediaplayerscxml main.cpp thedatamodel.cpp thedatamodel.h ) -set_target_properties(mediaplayer PROPERTIES +set_target_properties(mediaplayerscxml PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(mediaplayer PUBLIC +target_link_libraries(mediaplayerscxml PUBLIC Qt::Core Qt::Gui Qt::Qml @@ -37,7 +37,7 @@ set(mediaplayer_resource_files "Mediaplayer.qml" ) -qt6_add_resources(mediaplayer "mediaplayer" +qt6_add_resources(mediaplayerscxml "mediaplayer" PREFIX "/" FILES @@ -45,11 +45,11 @@ qt6_add_resources(mediaplayer "mediaplayer" ) # Statecharts: -qt6_add_statecharts(mediaplayer +qt6_add_statecharts(mediaplayerscxml mediaplayer.scxml ) -install(TARGETS mediaplayer +install(TARGETS mediaplayerscxml RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" |