Skip to content

Commit

Permalink
Avoid duplicate declarations with latest libcloudproviders
Browse files Browse the repository at this point in the history
Only install the .ini if the target version doen't support the .desktop file
declaration.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
  • Loading branch information
tintou authored and backportbot-nextcloud[bot] committed Jan 19, 2024
1 parent 74d3ac5 commit 6ddfb33
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion shell_integration/libcloudproviders/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@ IF (Qt5DBus_FOUND)
set(LIBCLOUDPROVIDERS_DBUS_OBJECT_PATH "/${DBUS_PREFIX}/${DBUS_VENDOR}/${DBUS_APPLICATION_NAME}")

dbus_add_activation_service(org.freedesktop.CloudProviders.service.in)
libcloudproviders_add_config(org.freedesktop.CloudProviders.ini.in)
# The .ini file has been replaced by a declaration in the .desktop file in 0.3.3+
if (${CLOUDPROVIDERS_VERSION} VERSION_LESS "0.3.3")
libcloudproviders_add_config(org.freedesktop.CloudProviders.ini.in)
endif ()
ENDIF ()

0 comments on commit 6ddfb33

Please sign in to comment.