From 3e52513c11bb20f268f0dacb7541e9c662fc9342 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 11 Nov 2008 10:44:48 +0000 Subject: Port to FindPkgConfig svn path=/trunk/KDE/kdelibs/; revision=882703 --- modules/FindLCMS.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/FindLCMS.cmake b/modules/FindLCMS.cmake index 12b575c5..1abfd297 100644 --- a/modules/FindLCMS.cmake +++ b/modules/FindLCMS.cmake @@ -9,13 +9,13 @@ # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls if(NOT WIN32) -INCLUDE(UsePkgConfig) -PKGCONFIG(lcms _LcmsIncDir _LcmsLinkDir _LcmsLinkFlags _LcmsCflags) -SET(LCMS_DEFINITIONS ${_LcmsCflags}) +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(LCMS lcms) +SET(LCMS_DEFINITIONS ${LCMS_CFLAGS}) endif(NOT WIN32) find_path(LCMS_INCLUDE_DIR lcms.h - ${_LcmsIncDir} + ${LCMS_INCLUDE_DIRS} ${CMAKE_INSTALL_PREFIX}/include /usr/include/lcms /usr/include/liblcms1 @@ -27,7 +27,7 @@ find_path(LCMS_INCLUDE_DIR lcms.h find_library(LCMS_LIBRARIES NAMES lcms liblcms lcms-1 liblcms-1 PATHS - ${_LcmsLinkDir} + ${LCMS_LIBRARY_DIRS} ${CMAKE_INSTALL_PREFIX}/lib /usr/lib/lcms /usr/local/lib/lcms -- cgit v1.2.1