From 8d88fdf2461f7fe521ba2a4da945ed670557eb13 Mon Sep 17 00:00:00 2001 From: Dario Freddi Date: Mon, 31 Aug 2009 00:25:55 +0000 Subject: CCMAIL: nicola.gigante@gmail.com Merging the KAuth framework, part of Nicola's GSoC project, into KDELibs svn path=/trunk/KDE/kdelibs/; revision=1017607 --- modules/MacroKAuth.cmake | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 modules/MacroKAuth.cmake (limited to 'modules/MacroKAuth.cmake') diff --git a/modules/MacroKAuth.cmake b/modules/MacroKAuth.cmake new file mode 100644 index 00000000..f051ee4e --- /dev/null +++ b/modules/MacroKAuth.cmake @@ -0,0 +1,61 @@ + +execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data --locate kauth/dbus_service.stub OUTPUT_VARIABLE KDE4_KAUTH_DBUS_SERVICE_STUB ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +message(STATUS "KAuth: DBus service stub file found at ${KDE4_KAUTH_DBUS_SERVICE_STUB}") +execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data --locate kauth/dbus_policy.stub OUTPUT_VARIABLE KDE4_KAUTH_DBUS_POLICY_STUB ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +message(STATUS "KAuth: DBus policy stub file found at ${KDE4_KAUTH_DBUS_POLICY_STUB}") +execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path libexec --locate kauth-policy-gen OUTPUT_VARIABLE KDE4_KAUTH_POLICY_GEN ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + +set( KDE4_KAUTH_DBUS_POLICY_STUB ${DATA_INSTALL_DIR}/kauth/dbus_policy.stub) +set( KDE4_KAUTH_DBUS_SERVICE_STUB ${DATA_INSTALL_DIR}/kauth/dbus_service.stub) +set( KDE4_KAUTH_POLICY_GEN ${LIBEXEC_INSTALL_DIR}/kauth-policy-gen) + +if(NOT KDE4_KAUTH_DBUS_SERVICE_STUB) + message(FATAL_ERROR "DBus service stub file couldn't be found (required by kde4_auth_add_helper macro)") +endif(NOT KDE4_KAUTH_DBUS_SERVICE_STUB) + +if(NOT KDE4_KAUTH_DBUS_POLICY_STUB) + message(FATAL_ERROR "DBus policy stub file couldn't be found (required by kde4_auth_add_helper macro)") +endif(NOT KDE4_KAUTH_DBUS_POLICY_STUB) + +if(NOT KDE4_KAUTH_POLICY_GEN) + message(FATAL_ERROR "KAuth policy generator tool couldn't be found (required by kde4_auth_register_actions macro)") +endif(NOT KDE4_KAUTH_POLICY_GEN) + +macro(kde4_auth_add_helper _HELPER_TARGET _HELPER_ID _HELPER_USER) + + set(HELPER_ID ${_HELPER_ID}) + set(HELPER_TARGET ${_HELPER_TARGET}) + set(HELPER_USER ${_HELPER_USER}) + + kde4_add_executable(${HELPER_TARGET} ${ARGN}) + target_link_libraries(${HELPER_TARGET} ${KDE4_KDECORE_LIBS}) + install(TARGETS ${HELPER_TARGET} DESTINATION ${LIBEXEC_INSTALL_DIR}) + + configure_file(${KDE4_KAUTH_DBUS_POLICY_STUB} ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf DESTINATION /etc/dbus-1/system.d/) + + configure_file(${KDE4_KAUTH_DBUS_SERVICE_STUB} ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service DESTINATION /usr/share/dbus-1/system-services ) + + +endmacro(kde4_auth_add_helper) + +macro(kde4_auth_register_actions HELPER_ID ACTIONS_FILE) + +if(APPLE) + install(CODE "execute_process(COMMAND ${KDE4_KAUTH_POLICY_GEN} ${ACTIONS_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") +elseif(UNIX) + set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy) + get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE) + + add_custom_command(OUTPUT ${_output} + COMMAND ${KDE4_KAUTH_POLICY_GEN} ${_input} > ${_output} + MAIN_DEPENDENCY ${_input} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Generating ${HELPER_ID}.policy") + add_custom_target("actions for ${HELPER_ID}" ALL DEPENDS ${_output}) + + install(FILES ${_output} DESTINATION ${POLICY_FILES_INSTALL_DIR}) +endif() + +endmacro(kde4_auth_register_actions) -- cgit v1.2.1 From 30f4fb9a7189168f8b9fc87001106ef2205a99a2 Mon Sep 17 00:00:00 2001 From: Dario Freddi Date: Mon, 31 Aug 2009 17:13:06 +0000 Subject: Fix modules svn path=/trunk/KDE/kdelibs/; revision=1017843 --- modules/MacroKAuth.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/MacroKAuth.cmake') diff --git a/modules/MacroKAuth.cmake b/modules/MacroKAuth.cmake index f051ee4e..57d994e4 100644 --- a/modules/MacroKAuth.cmake +++ b/modules/MacroKAuth.cmake @@ -55,7 +55,9 @@ elseif(UNIX) COMMENT "Generating ${HELPER_ID}.policy") add_custom_target("actions for ${HELPER_ID}" ALL DEPENDS ${_output}) + if (POLKITQT_FOUND) install(FILES ${_output} DESTINATION ${POLICY_FILES_INSTALL_DIR}) + endif (POLKITQT_FOUND) endif() endmacro(kde4_auth_register_actions) -- cgit v1.2.1 From 2e2020a1e1e4f140fb776d0073203770b5fe6708 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Mon, 31 Aug 2009 18:33:55 +0000 Subject: Don't hardcode /etc and /usr. svn path=/trunk/KDE/kdelibs/; revision=1017860 --- modules/MacroKAuth.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/MacroKAuth.cmake') diff --git a/modules/MacroKAuth.cmake b/modules/MacroKAuth.cmake index 57d994e4..826c85f2 100644 --- a/modules/MacroKAuth.cmake +++ b/modules/MacroKAuth.cmake @@ -32,10 +32,10 @@ macro(kde4_auth_add_helper _HELPER_TARGET _HELPER_ID _HELPER_USER) install(TARGETS ${HELPER_TARGET} DESTINATION ${LIBEXEC_INSTALL_DIR}) configure_file(${KDE4_KAUTH_DBUS_POLICY_STUB} ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf DESTINATION /etc/dbus-1/system.d/) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/) configure_file(${KDE4_KAUTH_DBUS_SERVICE_STUB} ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service DESTINATION /usr/share/dbus-1/system-services ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service DESTINATION ${DBUS_PREFIX}/share/dbus-1/system-services ) endmacro(kde4_auth_add_helper) -- cgit v1.2.1 From 96038bf56b933ae9c9dcaf7c8cd0b827173eb3af Mon Sep 17 00:00:00 2001 From: Michael Jansen Date: Mon, 31 Aug 2009 19:06:32 +0000 Subject: Respect PREFIX for "dbus system service" files and dbus "system configuration files". Please review extensively :) CCMAIL: kde-buildsystem@kde.org CCMAIL: drf@kde.org svn path=/trunk/KDE/kdelibs/; revision=1017870 --- modules/MacroKAuth.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/MacroKAuth.cmake') diff --git a/modules/MacroKAuth.cmake b/modules/MacroKAuth.cmake index 826c85f2..f05bc8b4 100644 --- a/modules/MacroKAuth.cmake +++ b/modules/MacroKAuth.cmake @@ -35,7 +35,7 @@ macro(kde4_auth_add_helper _HELPER_TARGET _HELPER_ID _HELPER_USER) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/) configure_file(${KDE4_KAUTH_DBUS_SERVICE_STUB} ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service DESTINATION ${DBUS_PREFIX}/share/dbus-1/system-services ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR}) endmacro(kde4_auth_add_helper) -- cgit v1.2.1 From f2aab6c074c4f965941e7e02ed6a5f24ad8871bc Mon Sep 17 00:00:00 2001 From: Dario Freddi Date: Mon, 7 Sep 2009 10:28:45 +0000 Subject: CCMAIL:kde-buildsystem@kde.org CCMAIL:mueller@kde.org CCMAIL:neundorf@kde.org Commit coming after a long discussion with Alexander. Changing and moving KAuth macros, updating documentation, fixing stuff that already used KAuth. Also, bumping up KDE revision, KDE4WORKSPACE revision and make kdebase/workspace depend on the new 4.3.68 snapshot. Mail me if you find anything strange, it's my first KDE version bump, so you know ;) A big thank you to Alexander for all the help he gave on the cmake side of life. svn path=/trunk/KDE/kdelibs/; revision=1020835 --- modules/MacroKAuth.cmake | 62 +----------------------------------------------- 1 file changed, 1 insertion(+), 61 deletions(-) (limited to 'modules/MacroKAuth.cmake') diff --git a/modules/MacroKAuth.cmake b/modules/MacroKAuth.cmake index f05bc8b4..2bde63ce 100644 --- a/modules/MacroKAuth.cmake +++ b/modules/MacroKAuth.cmake @@ -1,63 +1,3 @@ +message(FATAL_ERROR "Don't include(MacroKAuth) anymore, it's now included in find_package(KDE4). This file will be removed soon, and will not appear in KDE 4.4 release.") -execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data --locate kauth/dbus_service.stub OUTPUT_VARIABLE KDE4_KAUTH_DBUS_SERVICE_STUB ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -message(STATUS "KAuth: DBus service stub file found at ${KDE4_KAUTH_DBUS_SERVICE_STUB}") -execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data --locate kauth/dbus_policy.stub OUTPUT_VARIABLE KDE4_KAUTH_DBUS_POLICY_STUB ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -message(STATUS "KAuth: DBus policy stub file found at ${KDE4_KAUTH_DBUS_POLICY_STUB}") -execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path libexec --locate kauth-policy-gen OUTPUT_VARIABLE KDE4_KAUTH_POLICY_GEN ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -set( KDE4_KAUTH_DBUS_POLICY_STUB ${DATA_INSTALL_DIR}/kauth/dbus_policy.stub) -set( KDE4_KAUTH_DBUS_SERVICE_STUB ${DATA_INSTALL_DIR}/kauth/dbus_service.stub) -set( KDE4_KAUTH_POLICY_GEN ${LIBEXEC_INSTALL_DIR}/kauth-policy-gen) - -if(NOT KDE4_KAUTH_DBUS_SERVICE_STUB) - message(FATAL_ERROR "DBus service stub file couldn't be found (required by kde4_auth_add_helper macro)") -endif(NOT KDE4_KAUTH_DBUS_SERVICE_STUB) - -if(NOT KDE4_KAUTH_DBUS_POLICY_STUB) - message(FATAL_ERROR "DBus policy stub file couldn't be found (required by kde4_auth_add_helper macro)") -endif(NOT KDE4_KAUTH_DBUS_POLICY_STUB) - -if(NOT KDE4_KAUTH_POLICY_GEN) - message(FATAL_ERROR "KAuth policy generator tool couldn't be found (required by kde4_auth_register_actions macro)") -endif(NOT KDE4_KAUTH_POLICY_GEN) - -macro(kde4_auth_add_helper _HELPER_TARGET _HELPER_ID _HELPER_USER) - - set(HELPER_ID ${_HELPER_ID}) - set(HELPER_TARGET ${_HELPER_TARGET}) - set(HELPER_USER ${_HELPER_USER}) - - kde4_add_executable(${HELPER_TARGET} ${ARGN}) - target_link_libraries(${HELPER_TARGET} ${KDE4_KDECORE_LIBS}) - install(TARGETS ${HELPER_TARGET} DESTINATION ${LIBEXEC_INSTALL_DIR}) - - configure_file(${KDE4_KAUTH_DBUS_POLICY_STUB} ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/) - - configure_file(${KDE4_KAUTH_DBUS_SERVICE_STUB} ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR}) - - -endmacro(kde4_auth_add_helper) - -macro(kde4_auth_register_actions HELPER_ID ACTIONS_FILE) - -if(APPLE) - install(CODE "execute_process(COMMAND ${KDE4_KAUTH_POLICY_GEN} ${ACTIONS_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") -elseif(UNIX) - set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy) - get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE) - - add_custom_command(OUTPUT ${_output} - COMMAND ${KDE4_KAUTH_POLICY_GEN} ${_input} > ${_output} - MAIN_DEPENDENCY ${_input} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "Generating ${HELPER_ID}.policy") - add_custom_target("actions for ${HELPER_ID}" ALL DEPENDS ${_output}) - - if (POLKITQT_FOUND) - install(FILES ${_output} DESTINATION ${POLICY_FILES_INSTALL_DIR}) - endif (POLKITQT_FOUND) -endif() - -endmacro(kde4_auth_register_actions) -- cgit v1.2.1