diff options
| author | Dario Freddi <drf@kde.org> | 2010-01-24 18:10:27 +0000 |
|---|---|---|
| committer | Dario Freddi <drf@kde.org> | 2010-01-24 18:10:27 +0000 |
| commit | ee9bd12e141953230b55ea5cac01567eaa421432 (patch) | |
| tree | 3445d875d6227ba4edfd9afcfe0840671102cca6 /modules | |
| parent | 377a0187d5a3b5b9a104d3f14d790bcbe2c6c254 (diff) | |
| download | extra-cmake-modules-ee9bd12e141953230b55ea5cac01567eaa421432.tar.gz extra-cmake-modules-ee9bd12e141953230b55ea5cac01567eaa421432.tar.bz2 | |
CCMAIL: kde-packager@kde.org
Fixing some stuff for macros in KAuth to make it behave correctly without Find* files.
Also changing KAUTH_BACKEND to KDE4_AUTH_BACKEND_NAME for consistency.
Please switch your -DKAUTH_BACKEND=... to -DKDE4_AUTH_BACKEND_NAME=..., if any, soon. I'm backporting this commit now.
svn path=/trunk/KDE/kdelibs/; revision=1079648
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/KDE4Macros.cmake | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 5a7b701c..0c31aea7 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -1271,9 +1271,9 @@ endfunction(KDE4_INSTALL_AUTH_HELPER_FILES) # the install phase function(KDE4_INSTALL_AUTH_ACTIONS HELPER_ID ACTIONS_FILE) - if(APPLE) + if(KDE4_AUTH_BACKEND_NAME STREQUAL "APPLE") install(CODE "execute_process(COMMAND ${KDE4_KAUTH_POLICY_GEN_EXECUTABLE} ${ACTIONS_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") - elseif(UNIX) + elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT" OR KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1") set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy) get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE) @@ -1285,13 +1285,7 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPER_ID ACTIONS_FILE) DEPENDS ${_KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP}) add_custom_target("actions for ${HELPER_ID}" ALL DEPENDS ${_output}) - if (NOT POLKITQT_FOUND) - macro_optional_find_package(PolkitQt) - endif (NOT POLKITQT_FOUND) - - if (POLKITQT_FOUND) - install(FILES ${_output} DESTINATION ${POLKITQT_POLICY_FILES_INSTALL_DIR}) - endif (POLKITQT_FOUND) + install(FILES ${_output} DESTINATION ${KDE4_AUTH_POLICY_FILES_INSTALL_DIR}) endif() endfunction(KDE4_INSTALL_AUTH_ACTIONS) |