diff options
| author | Allen Winter <winter@kde.org> | 2007-12-16 19:51:40 +0000 |
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2007-12-16 19:51:40 +0000 |
| commit | 49d4e315f94488468ddf6e5729d1d35c48d34fe3 (patch) | |
| tree | e2060bb271540d9e922821de12fae20c25cf61db | |
| parent | 0279149fee4ccd9233e1cf7b649f65e38faccaa3 (diff) | |
| download | extra-cmake-modules-49d4e315f94488468ddf6e5729d1d35c48d34fe3.tar.gz extra-cmake-modules-49d4e315f94488468ddf6e5729d1d35c48d34fe3.tar.bz2 | |
use FindPkgConfig instead of UsePkgConfig
svn path=/trunk/KDE/kdelibs/; revision=749197
| -rw-r--r-- | modules/FindXmms.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/modules/FindXmms.cmake b/modules/FindXmms.cmake index 3ff8659a..7eb2d383 100644 --- a/modules/FindXmms.cmake +++ b/modules/FindXmms.cmake @@ -1,9 +1,9 @@ # Search xmms ## Once done this will define # -# XMMS_FOUND - system has xmms -# XMMS_INCLUDE_DIR - the xmms include directory -# XMMS_LIBRARIES - Link these to use xmms +# XMMS_FOUND - system has xmms +# XMMS_INCLUDE_DIRS - the xmms include directory +# XMMS_LDFLAGS - Link these to use xmms # # Copyright (c) 2006, 2007 Laurent Montel, <montel@kde.org> # Copyright (c) 2007 Allen Winter <winter@kde.org> @@ -11,29 +11,29 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (XMMS_INCLUDE_DIR AND XMMS_LIBRARIES) +if (XMMS_INCLUDE_DIRS AND XMMS_LDFLAGS) # in cache already SET(XMMS_FOUND TRUE) -else (XMMS_INCLUDE_DIR AND XMMS_LIBRARIES) +else (XMMS_INCLUDE_DIRS AND XMMS_LDFLAGS) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) + INCLUDE(FindPkgConfig) - PKGCONFIG(xmms _XMMSIncDir _XMMSLinkDir _XMMSLinkFlags _XMMSCflags) + PKG_CHECK_MODULES(XMMS xmms) ENDIF(NOT WIN32) - FIND_PATH(XMMS_INCLUDE_DIR xmmsctrl.h + FIND_PATH(XMMS_INCLUDE_DIRS xmmsctrl.h PATHS ${_XMMSIncDir} PATH_SUFFIXES xmms) - FIND_LIBRARY(XMMS_LIBRARIES NAMES xmms + FIND_LIBRARY(XMMS_LDFLAGS NAMES xmms PATHS ${_XMMSLinkDir}) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xmms DEFAULT_MSG - XMMS_LIBRARIES XMMS_INCLUDE_DIR) + XMMS_LDFLAGS XMMS_INCLUDE_DIRS) - MARK_AS_ADVANCED(XMMS_INCLUDE_DIR XMMS_LIBRARIES) + MARK_AS_ADVANCED(XMMS_INCLUDE_DIRS XMMS_LDFLAGS) -endif (XMMS_INCLUDE_DIR AND XMMS_LIBRARIES) +endif (XMMS_INCLUDE_DIRS AND XMMS_LDFLAGS) |