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/FindLibAttica.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/FindLibAttica.cmake')
| -rw-r--r-- | modules/FindLibAttica.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/FindLibAttica.cmake b/modules/FindLibAttica.cmake index b9b0610a..f901075a 100644 --- a/modules/FindLibAttica.cmake +++ b/modules/FindLibAttica.cmake @@ -14,6 +14,11 @@ IF (NOT LIBATTICA_MIN_VERSION) SET(LIBATTICA_MIN_VERSION "0.1.0") ENDIF(NOT LIBATTICA_MIN_VERSION) +IF (LIBATTICA_INCLUDE_DIR AND LIBATTICA_LIBRARIES) + # in cache already + SET(libattica_FIND_QUIETLY TRUE) +ENDIF (LIBATTICA_INCLUDE_DIR AND LIBATTICA_LIBRARIES) + IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls @@ -54,9 +59,10 @@ FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica ) INCLUDE(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set LIBATTICA_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set ATTICA_FOUND to TRUE if # all listed variables are TRUE -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAttica DEFAULT_MSG LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR LIBATTICA_VERSION_OK) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(libattica DEFAULT_MSG LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR LIBATTICA_VERSION_OK) MARK_AS_ADVANCED(LIBATTICA_INCLUDE_DIR LIBATTICA_LIBRARIES) + |