diff options
author | Alexander Neundorf <neundorf@kde.org> | 2010-01-13 18:50:07 +0000 |
---|---|---|
committer | Alexander Neundorf <neundorf@kde.org> | 2010-01-13 18:50:07 +0000 |
commit | f04076a5ddcf0a551b8a45e0e11c9e0ee353e82d (patch) | |
tree | c4c4847501076a459fc024d36360955f57d5efdc | |
parent | fac974adfa9f3a9f0b44355ac2e6a4301905d4fa (diff) | |
download | extra-cmake-modules-f04076a5ddcf0a551b8a45e0e11c9e0ee353e82d.tar.gz extra-cmake-modules-f04076a5ddcf0a551b8a45e0e11c9e0ee353e82d.tar.bz2 |
-don't try to mark non-cache variables as advanced
-mark VERSION_FILE as advanced (part of the patch from Dario)
Alex
CCMAIL: drf54321@gmail.com
svn path=/trunk/KDE/kdelibs/; revision=1074260
-rw-r--r-- | modules/FindPolkitQt-1.cmake | 8 | ||||
-rw-r--r-- | modules/FindPolkitQt.cmake | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/modules/FindPolkitQt-1.cmake b/modules/FindPolkitQt-1.cmake index d610d00f..159a54cc 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,13 +85,13 @@ 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_LIBRARIES - POLKITQT-1_VERSION_OK + POLKITQT-1_AGENT_LIBRARY + POLKITQT-1_VERSION_FILE ) if (POLKITQT-1_FOUND) diff --git a/modules/FindPolkitQt.cmake b/modules/FindPolkitQt.cmake index d2431806..84a2b8b5 100644 --- a/modules/FindPolkitQt.cmake +++ b/modules/FindPolkitQt.cmake @@ -91,8 +91,7 @@ find_package_handle_standard_args(PolkitQt DEFAULT_MSG POLKITQT_INCLUDE_DIR PO mark_as_advanced(POLKITQT_INCLUDE_DIR POLKITQT_CORE_LIBRARY POLKITQT_GUI_LIBRARY - POLKITQT_LIBRARIES - POLKITQT_VERSION_OK + POLKITQT_VERSION_FILE ) if(POLKITQT_FOUND) |