Feature: Desktop Builds x64 Linux - #3
Merged
Merged
Conversation
rikled
force-pushed
the
feature/desktopappsbuilds
branch
from
March 6, 2026 11:31
423c2dc to
99e2e22
Compare
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
…y boost missing Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
rikled
force-pushed
the
feature/desktopappsbuilds
branch
from
March 19, 2026 10:09
168e397 to
7124a57
Compare
This was referenced Mar 28, 2026
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
rikled
marked this pull request as ready for review
March 31, 2026 22:08
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
CarlSchwan
reviewed
Apr 22, 2026
|
|
||
| # 10. Translations | ||
| file(GLOB TS_FILES "langs/*.ts") | ||
| qt5_create_translation(DesktopEditors TS_FILES ${TS_FILES}) |
There was a problem hiding this comment.
Suggested change
| qt5_create_translation(DesktopEditors TS_FILES ${TS_FILES}) | |
| qt_create_translation(DesktopEditors TS_FILES ${TS_FILES}) |
Comment on lines
+384
to
+388
| Qt${QT_VERSION_MAJOR}::Widgets | ||
| Qt${QT_VERSION_MAJOR}::Svg | ||
| Qt${QT_VERSION_MAJOR}::PrintSupport | ||
| Qt${QT_VERSION_MAJOR}::Multimedia | ||
| Qt${QT_VERSION_MAJOR}::MultimediaWidgets |
There was a problem hiding this comment.
Suggested change
| Qt${QT_VERSION_MAJOR}::Widgets | |
| Qt${QT_VERSION_MAJOR}::Svg | |
| Qt${QT_VERSION_MAJOR}::PrintSupport | |
| Qt${QT_VERSION_MAJOR}::Multimedia | |
| Qt${QT_VERSION_MAJOR}::MultimediaWidgets | |
| Qt::Widgets | |
| Qt::Svg | |
| Qt::PrintSupport | |
| Qt::Multimedia | |
| Qt::MultimediaWidgets |
Use qt versionless targets
Comment on lines
+423
to
+424
| Qt${QT_VERSION_MAJOR}::DBus | ||
| Qt${QT_VERSION_MAJOR}::X11Extras |
There was a problem hiding this comment.
Suggested change
| Qt${QT_VERSION_MAJOR}::DBus | |
| Qt${QT_VERSION_MAJOR}::X11Extras | |
| Qt::DBus | |
| Qt::X11Extras |
Comment on lines
+425
to
+427
| ${ICU_INSTALL_DIR_ABS}/lib/libicuuc.so.${ICU_MAJOR_VER} | ||
| ${ICU_INSTALL_DIR_ABS}/lib/libicudata.so.${ICU_MAJOR_VER} | ||
| ${ICU_INSTALL_DIR_ABS}/lib/libicui18n.so.${ICU_MAJOR_VER} |
There was a problem hiding this comment.
Ideally, this should use https://cmake.org/cmake/help/latest/module/FindICU.html because adding directly .so files to target_link_libraries is quite ugly
Comment on lines
+137
to
+138
| set(QT_DIR "${QT_ROOT}/lib/cmake/Qt5") | ||
| set(Qt5_DIR "${QT_ROOT}/lib/cmake/Qt5") |
There was a problem hiding this comment.
Suggested change
| set(QT_DIR "${QT_ROOT}/lib/cmake/Qt5") | |
| set(Qt5_DIR "${QT_ROOT}/lib/cmake/Qt5") |
Not used
Comment on lines
+348
to
+350
| qt5_add_resources(RESOURCES resources.qrc) | ||
| if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/extras.qrc") | ||
| qt5_add_resources(RESOURCES extras.qrc) |
There was a problem hiding this comment.
Suggested change
| qt5_add_resources(RESOURCES resources.qrc) | |
| if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/extras.qrc") | |
| qt5_add_resources(RESOURCES extras.qrc) | |
| qt_add_resources(RESOURCES resources.qrc) | |
| if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/extras.qrc") | |
| qt_add_resources(RESOURCES extras.qrc) |
| qt5_add_resources(RESOURCES extras.qrc) | ||
| endif() | ||
|
|
||
| add_executable(DesktopEditors ${COMMON_SOURCES} ${COMMON_HEADERS} ${RESOURCES}) |
There was a problem hiding this comment.
modern cmake would define the target on top and then use target_sources instead
| set_default_options(DesktopEditors) | ||
|
|
||
| find_package(PkgConfig REQUIRED) | ||
| pkg_check_modules(DBUS REQUIRED dbus-1) |
There was a problem hiding this comment.
Suggested change
| pkg_check_modules(DBUS REQUIRED dbus-1) | |
| pkg_check_modules(DBUS REQUIRED IMPORTED_TARGET dbus-1) |
| src/prop | ||
| src | ||
| ${GTK3_INCLUDE_DIRS} | ||
| ${DBUS_INCLUDE_DIRS} |
There was a problem hiding this comment.
Suggested change
| ${DBUS_INCLUDE_DIRS} |
| Qt${QT_VERSION_MAJOR}::Multimedia | ||
| Qt${QT_VERSION_MAJOR}::MultimediaWidgets | ||
| ${PLATFORM_LIBS} | ||
| ${DBUS_LIBRARIES} |
There was a problem hiding this comment.
Suggested change
| ${DBUS_LIBRARIES} | |
| PkgConfig::DBUS |
Member
Author
|
Thanks for the comments. We currently need qt5.9.9 for DesktopEditors to work, so we need to explicitly point to our own compiled version. I'll merge this now to have something working, but feel free to open a PR with improvements :) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR introduces CMake as build routine for desktop-apps.
Depends on: Euro-Office/core#13, Euro-Office/desktop-sdk#1