diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2024-12-13 06:37:21 +0100 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2024-12-19 05:15:00 +0100 |
| commit | c8c3d8641f72e979cd7da11901b6a2ae0745de0b (patch) | |
| tree | e8116fc4583a76f35d3a6b8bcf49e0d96b035b81 /xT/CMakeLists.txt | |
| parent | e5f6ac40b7dd5c3b9b6d7fbc3e54d71126eda220 (diff) | |
| download | xK-c8c3d8641f72e979cd7da11901b6a2ae0745de0b.tar.gz xK-c8c3d8641f72e979cd7da11901b6a2ae0745de0b.tar.xz xK-c8c3d8641f72e979cd7da11901b6a2ae0745de0b.zip | |
We have to decouple the UI from the relay code.
Diffstat (limited to 'xT/CMakeLists.txt')
| -rw-r--r-- | xT/CMakeLists.txt | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/xT/CMakeLists.txt b/xT/CMakeLists.txt index 8f27be3..562c15a 100644 --- a/xT/CMakeLists.txt +++ b/xT/CMakeLists.txt @@ -12,8 +12,10 @@ project (xT VERSION "${project_version}" set (CMAKE_CXX_STANDARD 17) set (CMAKE_CXX_STANDARD_REQUIRED ON) -find_package (Qt6 REQUIRED COMPONENTS Widgets Network Multimedia) -qt_standard_project_setup () +find_package (Qt6 REQUIRED COMPONENTS Widgets Network Multimedia + Quick QuickControls2) +# XXX: The version requirement is probably for Qt Quick only. +qt_standard_project_setup (REQUIRES 6.5) add_compile_options ("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>") add_compile_options ("$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra>") @@ -77,7 +79,7 @@ else () endif () # Build the main executable and link it -find_program (awk_EXECUTABLE awk ${find_program_REQUIRE}) +find_program (awk_EXECUTABLE awk REQUIRED) add_custom_command (OUTPUT xC-proto.cpp COMMAND ${CMAKE_COMMAND} -E env LC_ALL=C ${awk_EXECUTABLE} -f ${root}/liberty/tools/lxdrgen.awk @@ -103,11 +105,24 @@ set_target_properties (xT PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON # https://stackoverflow.com/questions/79079161 and resolved in Qt Creator 16. set (QT_QML_GENERATE_QMLLS_INI ON) +# TODO(p): Perhaps do it in one-or-the-other way, +# as Qt Quick sucks on the desktop, and Qt Widgets is unusable on mobile. +qt_add_executable (xTq + xTq.cpp ${project_config} ${project_sources} "${icon_icns}") +set_property (SOURCE xTq.qml APPEND PROPERTY QT_QML_SOURCE_TYPENAME Main) +qt_add_qml_module (xTq URI xTquick VERSION 1.0 QML_FILES xTq.qml) +add_dependencies (xTq xC-proto) +qt_add_resources (xTq "rsrc" PREFIX / FILES "${beep}" ${icon_rsrc_list}) +target_link_libraries (xTq PRIVATE + Qt6::Quick Qt6::QuickControls2 Qt6::Network Qt6::Multimedia) +set_target_properties (xTq PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON + MACOSX_BUNDLE_GUI_IDENTIFIER name.janouch.xTq) + # The files to be installed include (GNUInstallDirs) if (ANDROID) - install (TARGETS xT DESTINATION .) + install (TARGETS xTq DESTINATION .) elseif (APPLE OR WIN32) install (TARGETS xT BUNDLE DESTINATION . @@ -144,7 +159,7 @@ if (WIN32) foreach (lib ${libs}) string (STRIP "${lib}" lib) file (COPY "${cygroot}${lib}" DESTINATION "${bindir}") - endforeach() + endforeach () endif () ]=]) endif () |