diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2023-02-03 18:00:40 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2023-02-07 12:35:05 +0100 |
| commit | 29b08dfb07b4ef72804f67ec38193aa4a1ea6b7a (patch) | |
| tree | 8f59699c18e20c6c073afc8c727582f540eaed5f /examples/serialbus/can | |
| parent | 4eb6a3c945ab3ea3409b38bacab813b1c83cdd3a (diff) | |
CAN Manager Example: fix CMakeLists.txt
* Use qt_standard_project_setup() instead of enabling AUTOMOC and
AUTOUIC manually
* Use PRIVATE linkage
* Use versionless CMake functions
Task-number: QTBUG-110890
Pick-to: 6.5
Change-Id: Iecbc59c1dd9950de649f0694b66de4568131afab
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'examples/serialbus/can')
| -rw-r--r-- | examples/serialbus/can/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/examples/serialbus/can/CMakeLists.txt b/examples/serialbus/can/CMakeLists.txt index eeb474a..d187aa4 100644 --- a/examples/serialbus/can/CMakeLists.txt +++ b/examples/serialbus/can/CMakeLists.txt @@ -6,9 +6,6 @@ project(can LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) - if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() @@ -17,6 +14,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/can") find_package(Qt6 REQUIRED COMPONENTS Core Gui Network SerialBus Widgets) +qt_standard_project_setup() + qt_add_executable(can bitratebox.cpp bitratebox.h canbusdeviceinfobox.h canbusdeviceinfobox.cpp canbusdeviceinfobox.ui @@ -34,7 +33,7 @@ set_target_properties(can PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(can PUBLIC +target_link_libraries(can PRIVATE Qt::Core Qt::Gui Qt::Network @@ -50,7 +49,7 @@ set(can_resource_files "images/disconnect.png" ) -qt6_add_resources(can "can" +qt_add_resources(can "can" PREFIX "/" FILES |