diff options
| author | Laurent Montel <montel@kde.org> | 2008-11-04 20:08:05 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2008-11-04 20:08:05 +0000 |
| commit | c2384636b87fae03be2ffbe61ed836fe62891c07 (patch) | |
| tree | 9a00c0168e4022ac3f30e62e07cef21f9103d7aa | |
| parent | aad79b808d22e0fe77e35214a7ed07fef79aef51 (diff) | |
| download | extra-cmake-modules-c2384636b87fae03be2ffbe61ed836fe62891c07.tar.gz extra-cmake-modules-c2384636b87fae03be2ffbe61ed836fe62891c07.tar.bz2 | |
Pino was right it's better to use KDE4_PLASMA_LIBS
find method to keep compatibility
Remove all requires to Plasma
svn path=/trunk/KDE/kdelibs/; revision=880118
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 6 | ||||
| -rw-r--r-- | modules/FindPlasma.cmake | 30 |
2 files changed, 11 insertions, 25 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index e0586912..1de515b7 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -44,6 +44,7 @@ # KDE4_KNEPOMUK_LIBRARY - the knepomuk library # KDE4_KMETADATA_LIBRARY - the kmetadata library # KDE4_KFORMULA_LIBRARY - the kformula library +# KDE4_PLASMA_LIBRARY - the plasma library # # Compared to the variables above, the following variables # also contain all of the depending libraries, so the variables below @@ -73,6 +74,7 @@ # KDE4_KNEPOMUK_LIBS - the knepomuk library and all depending libraries # KDE4_KMETADATA_LIBS - the kmetadata library and all depending libraries # KDE4_KFORMULA_LIBS - the kformula library and all depending librairies +# KDE4_PLASMA_LIBS - the plasma library and all depending librairies # # This module defines a bunch of variables used as locations for install directories. # They can be relative (to CMAKE_INSTALL_PREFIX) or absolute. @@ -525,6 +527,10 @@ else (_kdeBootStrapping) find_library(KDE4_KFORMULA_LIBRARY NAMES kformula PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_KFORMULA_LIBS ${kformula_LIB_DEPENDS} ${KDE4_KFORMULA_LIBRARY} ) + find_library(KDE4_PLASMA_LIBRARY NAMES plasma PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_PLASMA_LIBS ${plasma_LIB_DEPENDS} ${KDE4_PLASMA_LIBRARY} ) + + get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH ) diff --git a/modules/FindPlasma.cmake b/modules/FindPlasma.cmake index 05a646b8..fc724342 100644 --- a/modules/FindPlasma.cmake +++ b/modules/FindPlasma.cmake @@ -8,31 +8,11 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (PLASMA_INCLUDE_DIR AND PLASMA_LIBS) - # Already in cache, be silent - set(Plasma_FIND_QUIETLY TRUE) -endif (PLASMA_INCLUDE_DIR AND PLASMA_LIBS) +set(PLASMA_LIBS ${KDE4_PLASMA_LIBS} ) +set(PLASMA_INCLUDE_DIR ${KDE4_INCLUDE_DIR}) - -find_path(PLASMA_INCLUDE_DIR NAMES plasma/plasma.h - PATHS - ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} -) - -find_library(PLASMA_LIBS NAMES plasma - PATHS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Plasma DEFAULT_MSG PLASMA_LIBS PLASMA_INCLUDE_DIR ) - -if (PLASMA_FOUND) - find_file(PLASMA_OPENGL_FOUND plasma/glapplet.h - PATHS ${PLASMA_INCLUDE_DIR} - NO_DEFAULT_PATH) -endif (PLASMA_FOUND) +find_file(PLASMA_OPENGL_FOUND plasma/glapplet.h + PATHS ${PLASMA_INCLUDE_DIR} + NO_DEFAULT_PATH) mark_as_advanced(PLASMA_INCLUDE_DIR PLASMA_LIBS) |