tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/20.04'

Browse source
This commit is contained in:
Nicolas Fella 2020-04-16 18:01:26 +02:00
commit cdcf3400dd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -81,7 +81,7 @@ if (KF5_OPTIONAL_COMPONENTS)
endif() endif()
if (NOT ZSH_AUTOCOMPLETE_DIR) if (NOT ZSH_AUTOCOMPLETE_DIR)
set(ZSH_AUTOCOMPLETE_DIR "${CMAKE_INSTALL_PREFIX}/share/zsh/site-functions") set(ZSH_AUTOCOMPLETE_DIR "${KDE_INSTALL_DATADIR}/share/zsh/site-functions")
endif() endif()
option(PRIVATE_DBUS_ENABLED "Use private dbus session for kdeconnect" OFF) option(PRIVATE_DBUS_ENABLED "Use private dbus session for kdeconnect" OFF)

4
data/CMakeLists.txt
View file

@ -1,5 +1,5 @@
install (FILES "kdeconnect.contract" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor/) install (FILES "kdeconnect.contract" DESTINATION ${KDE_INSTALL_DATADIR}/share/contractor/)
install (FILES "kdeconnect-thunar.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/Thunar/sendto/) install (FILES "kdeconnect-thunar.desktop" DESTINATION ${KDE_INSTALL_DATADIR}/share/Thunar/sendto/)
install(PROGRAMS org.kde.kdeconnect_open.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(PROGRAMS org.kde.kdeconnect_open.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
if(NOT SAILFISHOS) if(NOT SAILFISHOS)