From 35dd2ee9a23590ad4d3dc904488320bb6f89cf11 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Wed, 27 Dec 2006 23:54:12 +0000 Subject: - add cmake variable for the new lib - change the cmake variable names for Phonon for consistency (from what I tested this doesn't break compilation) svn path=/trunk/KDE/kdelibs/; revision=617094 --- modules/FindKDE4Internal.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index c555c9d8..0dce1e0a 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -37,6 +37,7 @@ # KDE4_KDNSSD_LIBRARY - the kdnssd library # KDE4_PHONONCORE_LIBRARY - the phononcore library # KDE4_PHONONUI_LIBRARY - the phononui library +# KDE4_KALSADEVICELIST_LIBRARY - the kalsadevicelist library # KDE4_KDEFX_LIBRARY - the kdefx library # KDE4_THREADWEAVER_LIBRARY- the threadweaver library # KDE4_SOLID_LIBRARY - the solid library @@ -426,11 +427,14 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) find_library(KDE4_KXMLCORE_LIBRARY NAMES kxmlcore PATHS ${KDE4_LIB_INSTALL_DIR} ) set(KDE4_KXMLCORE_LIBRARIES ${kxmlcore_LIB_DEPENDS} ${KDE4_KXMLCORE_LIBRARY} ) - find_library(KDE4_PHONONCORE_LIBRARY NAMES phononcore PATHS ${KDE4_LIB_INSTALL_DIR} ) - set(KDE4_PHONONCORE_LIBRARIES ${phononcore_LIB_DEPENDS} ${KDE4_PHONONCORE_LIBRARY} ) + find_library(KDE4_PHONONCORE_LIBRARY NAMES phononcore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_PHONONCORE_LIBS ${phononcore_LIB_DEPENDS} ${KDE4_PHONONCORE_LIBRARY} ) - find_library(KDE4_PHONONUI_LIBRARY NAMES phononui PATHS ${KDE4_LIB_INSTALL_DIR} ) - set(KDE4_PHONONUI_LIBRARIES ${phononui_LIB_DEPENDS} ${KDE4_PHONONUI_LIBRARY} ) + find_library(KDE4_PHONONUI_LIBRARY NAMES phononui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_PHONONUI_LIBS ${phononui_LIB_DEPENDS} ${KDE4_PHONONUI_LIBRARY} ) + + find_library(KDE4_KALSADEVICELIST_LIBRARY NAMES kalsadevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_KALSADEVICELIST_LIBS ${kalsadevicelist_LIB_DEPENDS} ${KDE4_KALSADEVICELIST_LIBRARY} ) find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} ) set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) -- cgit v1.2.1