SVN commit 636293 by ianmonroe: cmake was half-way using the xine-lib installed in /usr/ instead of the CVS xine-lib I had installed in the KDE prefix. Changed FindXine to rely on the pkgconfig. M +8 -6 FindXine.cmake --- trunk/KDE/kdemultimedia/cmake/modules/FindXine.cmake #636292:636293 @@ -17,16 +17,18 @@ set(XINE_FIND_QUIETLY TRUE) endif (XINE_INCLUDE_DIR AND XINE_LIBRARIES) -FIND_PATH(XINE_INCLUDE_DIR xine.h - /usr/include/ - /usr/local/include/ -) +INCLUDE(UsePkgConfig) +PKGCONFIG(libxine _LibXineIncDir _LibXineLinkDir _LibXineLinkFlags _LibXineCflags) +FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h + PATHS + ${_LibXineIncDir} + NO_DEFAULT_PATH) FIND_LIBRARY(XINE_LIBRARY NAMES xine PATHS - /usr/lib - /usr/local/lib + ${_LibXineLinkDir} + NO_DEFAULT_PATH ) FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config PATHS