aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Freddi <drf@kde.org>2010-01-24 18:13:37 +0000
committerDario Freddi <drf@kde.org>2010-01-24 18:13:37 +0000
commitece346da13f43f4623fcbd9452999aeadf72d602 (patch)
tree3a172943ce49e8f1af4459c978f540bc6dfc87c4
parentf907cfe8a218688be5cdabde2ebf67ec3f7b0f1a (diff)
downloadextra-cmake-modules-ece346da13f43f4623fcbd9452999aeadf72d602.tar.gz
extra-cmake-modules-ece346da13f43f4623fcbd9452999aeadf72d602.tar.bz2
Backporting r1079648
svn path=/branches/KDE/4.4/kdelibs/; revision=1079649
-rw-r--r--modules/KDE4Macros.cmake12
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)