polkit-kde-kcmodules-1: prefix installation paths with KDE4_

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-25 19:15:27 +00:00
parent 84e6625523
commit d6ef198194
6 changed files with 66 additions and 26 deletions

View file

@ -15,7 +15,7 @@ function(dbus_add_activation_system_service _sources)
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
configure_file(${_service_file} ${_target})
install(FILES ${_target} DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR} )
install(FILES ${_target} DESTINATION ${KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR} )
endforeach (_i ${ARGN})
endfunction(dbus_add_activation_system_service _sources)
@ -33,4 +33,7 @@ add_subdirectory(polkitactions)
add_subdirectory(polkitconfig)
add_subdirectory(helper)
install( FILES settings-system-policies.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install(
FILES settings-system-policies.desktop
DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
)

View file

@ -1,19 +1,26 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
set( polkitkdekcmodulesprivate_SRCS
set(polkitkdekcmodulesprivate_SRCS
PKLAEntry.cpp
identitywidget.cpp
)
add_library (polkitkdekcmodulesprivate SHARED ${polkitkdekcmodulesprivate_SRCS})
add_library(polkitkdekcmodulesprivate SHARED ${polkitkdekcmodulesprivate_SRCS})
set_target_properties (polkitkdekcmodulesprivate PROPERTIES VERSION 0.1.0
SOVERSION 0)
set_target_properties(polkitkdekcmodulesprivate PROPERTIES
VERSION 0.1.0
SOVERSION 0
)
target_link_libraries(polkitkdekcmodulesprivate
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBRARY}
)
install(TARGETS polkitkdekcmodulesprivate DESTINATION ${LIB_INSTALL_DIR} )
install(
TARGETS polkitkdekcmodulesprivate
DESTINATION ${KDE4_LIB_INSTALL_DIR}
)

View file

@ -1,4 +1,7 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
# I know, sucks extremely hard, but it's the only way.
@ -23,7 +26,10 @@ add_custom_command(OUTPUT ${_output}
add_custom_target(genpolicy ALL DEPENDS ${_output})
# FIXME: hardcoded path
install(FILES ${_output} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions/)
install(
FILES ${_output}
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions/
)
#########
@ -40,11 +46,24 @@ qt4_add_dbus_adaptor(polkitkde1helper_SRCS
add_executable(polkitkde1helper ${polkitkde1helper_SRCS})
target_link_libraries(polkitkde1helper ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ${POLKITQT-1_CORE_LIBRARY} polkitkdekcmodulesprivate)
target_link_libraries(polkitkde1helper
${KDE4_KDECORE_LIBS}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTDBUS_LIBRARY}
${POLKITQT-1_CORE_LIBRARY}
polkitkdekcmodulesprivate
)
install(TARGETS polkitkde1helper DESTINATION ${LIBEXEC_INSTALL_DIR})
install(
TARGETS polkitkde1helper
DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}
)
dbus_add_activation_system_service(org.kde.polkitkde1.helper.service.in)
install(FILES org.kde.polkitkde1.helper.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d)
install(
FILES org.kde.polkitkde1.helper.conf
DESTINATION ${KDE4_SYSCONF_INSTALL_DIR}/dbus-1/system.d
)

View file

@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.kde.polkitkde1.helper
Exec=@LIBEXEC_INSTALL_DIR@/polkitkde1helper
Exec=@KDE4_LIBEXEC_INSTALL_DIR@/polkitkde1helper
User=root

View file

@ -1,7 +1,9 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
set( kcm_polkitactions_SRCS
set(kcm_polkitactions_SRCS
PolkitActionsKCM.cpp
AuthorizationsFilterModel.cpp
PoliciesModel.cpp
@ -20,9 +22,14 @@ target_link_libraries(kcm_polkitactions
polkitkdekcmodulesprivate
)
install(TARGETS kcm_polkitactions DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install( FILES kcm_polkitactions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install(
TARGETS kcm_polkitactions
DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
)
install(
FILES kcm_polkitactions.desktop
DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
)

View file

@ -13,10 +13,14 @@ target_link_libraries(kcm_polkitconfig
polkitkdekcmodulesprivate
)
install(TARGETS kcm_polkitconfig DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install( FILES kcm_polkitconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install(
TARGETS kcm_polkitconfig
DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
)
install(
FILES kcm_polkitconfig.desktop
DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
)