From 877046103ca395ba7b2d842fd00404869e54bef0 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 18 Nov 2008 21:58:50 +0000 Subject: -use the prefix PC_ for the variables coming from pkgconfig (these three modules were working correctly, this is just to establish a convention how to deal with this) Alex svn path=/trunk/KDE/kdelibs/; revision=886256 --- modules/FindLibArt.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/FindLibArt.cmake') diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake index 13191d23..d886eeb1 100644 --- a/modules/FindLibArt.cmake +++ b/modules/FindLibArt.cmake @@ -23,21 +23,21 @@ else (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - pkg_check_modules(LIBART libart-2.0) + pkg_check_modules(PC_LIBART libart-2.0) ######### ?? where is this used ?? ############### - set(LIBART_DEFINITIONS ${LIBART_CFLAGS}) + set(LIBART_DEFINITIONS ${PC_LIBART_CFLAGS}) ENDIF (NOT WIN32) - FIND_PATH(LIBART_INCLUDE_DIR libart_lgpl/libart.h - ${LIBART_INCLUDE_DIRS}/libart-2.0 - /usr/include/libart-2.0 - /usr/local/include/libart-2.0 + FIND_PATH(LIBART_INCLUDE_DIR NAMES libart_lgpl/libart.h + PATHS + ${PC_LIBART_INCLUDE_DIRS} + PATH_SUFFIXES libart-2.0 ) FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2 PATHS - ${LIBART_LIBRARY_DIRS} + ${PC_LIBART_LIBRARY_DIRS} ) -- cgit v1.2.1