aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2006-02-13 19:59:49 +0000
committerAlexander Neundorf <neundorf@kde.org>2006-02-13 19:59:49 +0000
commitce98385ad289708fba627ec288028ead04824a0e (patch)
tree653fbbd82cf65692d1f0e5b8aa08acf8a9bdd240
parent26b817a2afadfbd3b72fd77ca59c58a591bfa5f5 (diff)
downloadextra-cmake-modules-ce98385ad289708fba627ec288028ead04824a0e.tar.gz
extra-cmake-modules-ce98385ad289708fba627ec288028ead04824a0e.tar.bz2
it seems that for jasper jpeg is also required
Alex svn path=/trunk/KDE/kdelibs/; revision=509149
-rw-r--r--modules/FindJasper.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake
index 5eff452e..44f0a7a4 100644
--- a/modules/FindJasper.cmake
+++ b/modules/FindJasper.cmake
@@ -10,16 +10,18 @@ FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h
/usr/local/include
)
-FIND_LIBRARY(JASPER_LIBRARIES NAMES jasper libjasper
+FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper
PATHS
/usr/lib
/usr/local/lib
)
+FIND_PACKAGE(JPEG)
-IF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES)
+IF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
SET(JASPER_FOUND TRUE)
-ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES)
+ SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
+ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
IF(JASPER_FOUND)