diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-02-27 17:44:44 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-02-28 09:20:05 +0100 |
| commit | 15577301ed4544d8ffea906cd5468e693cc6f456 (patch) | |
| tree | 212b41296cd4f76edb9d5a5523275aa536bc3ca0 | |
| parent | 1a3489f66e96daa29683754c27868f859571ca24 (diff) | |
Make the calculator target name unique to avoid conflicts in top-level build
Rename the scxml 'calculator' target to 'calculatorscxml'
Amends 7801e05e659845ccc163c7e473ed4d91fa1de778
Pick-to: 6.5
Task-number: QTBUG-111090
Change-Id: Ic86f342a4407b9b79896262d8f990b8eb3536e4d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | examples/scxml/calculator/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/scxml/calculator/CMakeLists.txt b/examples/scxml/calculator/CMakeLists.txt index 336e9e4..36e1b55 100644 --- a/examples/scxml/calculator/CMakeLists.txt +++ b/examples/scxml/calculator/CMakeLists.txt @@ -14,16 +14,16 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/scxml/calculator") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Scxml) -qt_add_executable(calculator +qt_add_executable(calculatorscxml calculator.cpp ) -set_target_properties(calculator PROPERTIES +set_target_properties(calculatorscxml PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(calculator PUBLIC +target_link_libraries(calculatorscxml PUBLIC Qt::Core Qt::Gui Qt::Qml @@ -36,7 +36,7 @@ set(calculator_resource_files "calculator.qml" ) -qt6_add_resources(calculator "calculator" +qt6_add_resources(calculatorscxml "calculator" PREFIX "/" FILES @@ -44,11 +44,11 @@ qt6_add_resources(calculator "calculator" ) # Statecharts: -qt6_add_statecharts(calculator +qt6_add_statecharts(calculatorscxml statemachine.scxml ) -install(TARGETS calculator +install(TARGETS calculatorscxml RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" |