diff options
| author | Dario Freddi <drf@kde.org> | 2010-03-01 19:20:31 +0000 |
|---|---|---|
| committer | Dario Freddi <drf@kde.org> | 2010-03-01 19:20:31 +0000 |
| commit | 4b989a26ea40d46100fb7883dcec1778eb8d4533 (patch) | |
| tree | 6b79ca6535baff87dcebbebcfa9df4704c3e6b5b /modules/FindPolkitQt-1.cmake | |
| parent | 84ccffd809dc71de314f21cb747d590d246be3ed (diff) | |
| download | extra-cmake-modules-4b989a26ea40d46100fb7883dcec1778eb8d4533.tar.gz extra-cmake-modules-4b989a26ea40d46100fb7883dcec1778eb8d4533.tar.bz2 | |
This commit is a massive backport of: r1091455, r1091811, r1091516, r1091017, r1089968, r1089130 and maybe some others which I forgot.
Basically it makes KAuth's plugins dynamic, except for fake ones. Bottom line: less libraries linked to kdecore and no crashes upon installation problems.
Tested on a clean build of the branch, works great.
svn path=/branches/KDE/4.4/kdelibs/; revision=1097623
Diffstat (limited to 'modules/FindPolkitQt-1.cmake')
| -rw-r--r-- | modules/FindPolkitQt-1.cmake | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/modules/FindPolkitQt-1.cmake b/modules/FindPolkitQt-1.cmake index 159a54cc..8ef5b3c9 100644 --- a/modules/FindPolkitQt-1.cmake +++ b/modules/FindPolkitQt-1.cmake @@ -74,7 +74,7 @@ find_library( POLKITQT-1_GUI_LIBRARY NAMES polkit-qt-gui-1 HINTS ${PC_POLKITQT-1_LIBDIR} ) -find_library( POLKITQT-1_AGENT_LIBRARY +find_library( POLKITQT-1_AGENT_LIBRARY NAMES polkit-qt-agent-1 HINTS ${PC_POLKITQT-1_LIBDIR} ) @@ -85,14 +85,9 @@ include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set POLKITQT-1_FOUND to TRUE if # all listed variables are TRUE -find_package_handle_standard_args(PolkitQt-1 DEFAULT_MSG POLKITQT-1_LIBRARIES POLKITQT-1_INCLUDE_DIR POLKITQT-1_VERSION_OK) +find_package_handle_standard_args(PolkitQt-1 DEFAULT_MSG POLKITQT-1_LIBRARIES POLKITQT-1_INCLUDE_DIR POLKITQT-1_VERSION_OK) -mark_as_advanced(POLKITQT-1_INCLUDE_DIR - POLKITQT-1_CORE_LIBRARY - POLKITQT-1_GUI_LIBRARY - POLKITQT-1_AGENT_LIBRARY - POLKITQT-1_VERSION_FILE - ) +mark_as_advanced(POLKITQT-1_INCLUDE_DIR POLKITQT-1_CORE_LIBRARY POLKITQT-1_GUI_LIBRARY POLKITQT-1_LIBRARIES POLKITQT-1_VERSION_OK) if (POLKITQT-1_FOUND) if (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) |