diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-05-11 13:55:51 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-05-12 11:22:14 +0300 |
| commit | c84d82c8ae24e59c181aea48b8884ac60c7484a7 (patch) | |
| tree | 00fd200e135cdbd4bca49edfa2bed6eaf1442d11 | |
| parent | e53413402b3733972ce4029b6d0c0e4252078fbe (diff) | |
Turn canbusutil into app
A tool is normally not cross-compiled, but canbusutil is meant to be
used in the target env. Turn it into app so that it's always compiled,
except for iOS, WASM and rtems, where it's not expected to work.
Pick-to: 6.3 6.2
Change-Id: I4286ea524a05727c237ec68454e5406f96d7a7aa
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
| -rw-r--r-- | src/tools/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/tools/canbusutil/CMakeLists.txt | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index ace7502..61bfa83 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -1,3 +1,8 @@ -if(android_app OR (QT_FEATURE_commandlineparser AND NOT ANDROID)) - add_subdirectory(canbusutil) +if(android_app OR + (QT_FEATURE_commandlineparser + AND NOT ANDROID + AND NOT IOS + AND NOT WASM + AND NOT rtems)) + add_subdirectory(canbusutil) endif() diff --git a/src/tools/canbusutil/CMakeLists.txt b/src/tools/canbusutil/CMakeLists.txt index 220c440..e0d5cb6 100644 --- a/src/tools/canbusutil/CMakeLists.txt +++ b/src/tools/canbusutil/CMakeLists.txt @@ -2,10 +2,8 @@ ## canbusutil Tool: ##################################################################### -qt_get_tool_target_name(target_name canbusutil) -qt_internal_add_tool(${target_name} +qt_internal_add_app(canbusutil TARGET_DESCRIPTION "Qt CAN Bus Util" - TOOLS_TARGET SerialBus SOURCES canbusutil.cpp canbusutil.h main.cpp @@ -15,4 +13,4 @@ qt_internal_add_tool(${target_name} Qt::Network Qt::SerialBus ) -qt_internal_return_unless_building_tools() +set_target_properties(canbusutil PROPERTIES WIN32_EXECUTABLE FALSE) |