aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <kde@carewolf.com>2009-08-16 19:59:00 +0000
committerAllan Sandfeld Jensen <kde@carewolf.com>2009-08-16 19:59:00 +0000
commitf260ed76a36559119dc8e0819bb7e4de063bd0ac (patch)
tree9aab59502d43ba0f4fa825981f0139aca223e5ee
parent7c2c90c7fd2df31b30c022360da476711d91371a (diff)
downloadextra-cmake-modules-f260ed76a36559119dc8e0819bb7e4de063bd0ac.tar.gz
extra-cmake-modules-f260ed76a36559119dc8e0819bb7e4de063bd0ac.tar.bz2
Merge pkgconfig vs cmake fix from trunk
svn path=/branches/KDE/4.3/kdelibs/; revision=1012108
-rw-r--r--modules/FindPopplerQt4.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake
index fbc1820c..04911bbd 100644
--- a/modules/FindPopplerQt4.cmake
+++ b/modules/FindPopplerQt4.cmake
@@ -27,11 +27,12 @@ endif(NOT WIN32)
find_path(POPPLER_QT4_INCLUDE_DIR
NAMES poppler-qt4.h
PATH_SUFFIXES poppler/qt4 poppler
- PATHS ${_PopplerQt4IncDir}
+ HINTS ${_PopplerQt4IncDir}
)
-find_library(POPPLER_QT4_LIBRARIES poppler-qt4
- ${_PopplerQt4LinkDir}
+find_library(POPPLER_QT4_LIBRARIES
+ NAMES poppler-qt4
+ HINTS ${_PopplerQt4LinkDir}
)
if (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES)