summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIevgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>2023-03-31 15:45:19 +0200
committerIevgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>2023-04-12 10:45:35 +0200
commitc5a01a2a78f5eb2025442187029ca3effc4719ab (patch)
tree4600e79c19768ac1a5cf26801529d74dac576cc6
parent399b276f6d9aa395f4abad8191eba8b960084320 (diff)
statemachine examples: Modernize CMake files
Use qt_standard_project_setup() instead of setting CMAKE_AUTOMOC. Link Qt libraries as PRIVATE. Pick-to: 6.5 Task-number: QTBUG-111448 Change-Id: I9451bbd5cbeaaf71aaa5125a3de7cd3440651cb3 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
-rw-r--r--examples/statemachine/moveblocks/CMakeLists.txt6
-rw-r--r--examples/statemachine/pingpong/CMakeLists.txt6
-rw-r--r--examples/statemachine/rogue/CMakeLists.txt6
-rw-r--r--examples/statemachine/trafficlight/CMakeLists.txt6
4 files changed, 12 insertions, 12 deletions
diff --git a/examples/statemachine/moveblocks/CMakeLists.txt b/examples/statemachine/moveblocks/CMakeLists.txt
index a4ac7e1..8d82994 100644
--- a/examples/statemachine/moveblocks/CMakeLists.txt
+++ b/examples/statemachine/moveblocks/CMakeLists.txt
@@ -4,8 +4,6 @@
cmake_minimum_required(VERSION 3.16)
project(moveblocks LANGUAGES CXX)
-set(CMAKE_AUTOMOC ON)
-
if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/animation/moveblocks")
find_package(Qt6 REQUIRED COMPONENTS Core Gui StateMachine Widgets)
+qt_standard_project_setup()
+
qt_add_executable(moveblocks
main.cpp
)
@@ -23,7 +23,7 @@ set_target_properties(moveblocks PROPERTIES
MACOSX_BUNDLE TRUE
)
-target_link_libraries(moveblocks PUBLIC
+target_link_libraries(moveblocks PRIVATE
Qt::Core
Qt::Gui
Qt::StateMachine
diff --git a/examples/statemachine/pingpong/CMakeLists.txt b/examples/statemachine/pingpong/CMakeLists.txt
index 4810bf2..040b004 100644
--- a/examples/statemachine/pingpong/CMakeLists.txt
+++ b/examples/statemachine/pingpong/CMakeLists.txt
@@ -4,8 +4,6 @@
cmake_minimum_required(VERSION 3.16)
project(pingpong LANGUAGES CXX)
-set(CMAKE_AUTOMOC ON)
-
if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/pingpong")
find_package(Qt6 REQUIRED COMPONENTS Core StateMachine)
+qt_standard_project_setup()
+
qt_add_executable(pingpong
main.cpp
)
@@ -23,7 +23,7 @@ set_target_properties(pingpong PROPERTIES
MACOSX_BUNDLE FALSE
)
-target_link_libraries(pingpong PUBLIC
+target_link_libraries(pingpong PRIVATE
Qt::Core
Qt::StateMachine
)
diff --git a/examples/statemachine/rogue/CMakeLists.txt b/examples/statemachine/rogue/CMakeLists.txt
index 922aa96..007037f 100644
--- a/examples/statemachine/rogue/CMakeLists.txt
+++ b/examples/statemachine/rogue/CMakeLists.txt
@@ -4,8 +4,6 @@
cmake_minimum_required(VERSION 3.16)
project(rogue LANGUAGES CXX)
-set(CMAKE_AUTOMOC ON)
-
if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/rogue")
find_package(Qt6 REQUIRED COMPONENTS Core Gui StateMachine Widgets)
+qt_standard_project_setup()
+
qt_add_executable(rogue
main.cpp
movementtransition.h
@@ -25,7 +25,7 @@ set_target_properties(rogue PROPERTIES
MACOSX_BUNDLE TRUE
)
-target_link_libraries(rogue PUBLIC
+target_link_libraries(rogue PRIVATE
Qt::Core
Qt::Gui
Qt::StateMachine
diff --git a/examples/statemachine/trafficlight/CMakeLists.txt b/examples/statemachine/trafficlight/CMakeLists.txt
index e566324..04c3af0 100644
--- a/examples/statemachine/trafficlight/CMakeLists.txt
+++ b/examples/statemachine/trafficlight/CMakeLists.txt
@@ -4,8 +4,6 @@
cmake_minimum_required(VERSION 3.16)
project(trafficlight LANGUAGES CXX)
-set(CMAKE_AUTOMOC ON)
-
if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/statemachine/trafficlight
find_package(Qt6 REQUIRED COMPONENTS Core Gui StateMachine Widgets)
+qt_standard_project_setup()
+
qt_add_executable(trafficlight
main.cpp
)
@@ -23,7 +23,7 @@ set_target_properties(trafficlight PROPERTIES
MACOSX_BUNDLE TRUE
)
-target_link_libraries(trafficlight PUBLIC
+target_link_libraries(trafficlight PRIVATE
Qt::Core
Qt::Gui
Qt::StateMachine