From ad165145def9a60b1a16c315e0ab7b0272cddfa7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 14 Feb 2011 15:43:41 +0000 Subject: [PATCH] From Sukender, "Here is an minor update for Jasper finder. It adds debug cache value for Windows/MSVC builds, and adds search paths." --- CMakeModules/FindJasper.cmake | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/CMakeModules/FindJasper.cmake b/CMakeModules/FindJasper.cmake index 0bd732a38..acb949f14 100644 --- a/CMakeModules/FindJasper.cmake +++ b/CMakeModules/FindJasper.cmake @@ -11,6 +11,7 @@ FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h $ENV{JASPER_DIR}/include + $ENV{JASPER_DIR}/src/libjasper/include $ENV{JASPER_DIR} ~/Library/Frameworks /Library/Frameworks @@ -24,9 +25,29 @@ FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h ) FIND_LIBRARY(JASPER_LIBRARY - NAMES jasper + NAMES jasper libjasper PATHS $ENV{JASPER_DIR}/lib + $ENV{JASPER_DIR}/src/libjasper/lib + $ENV{JASPER_DIR}/src/msvc/Win32_Release + $ENV{JASPER_DIR} + ~/Library/Frameworks + /Library/Frameworks + /usr/local/lib + /usr/lib + /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 +) + +FIND_LIBRARY(JASPER_LIBRARY_DEBUG + NAMES jasper libjasper jasperd libjasperd + PATHS + $ENV{JASPER_DIR}/lib + $ENV{JASPER_DIR}/src/libjasper/lib + $ENV{JASPER_DIR}/src/msvc/Win32_Debug $ENV{JASPER_DIR} ~/Library/Frameworks /Library/Frameworks @@ -44,4 +65,3 @@ IF(JASPER_LIBRARY AND JASPER_INCLUDE_DIR) SET(JASPER_FOUND "YES") ENDIF(JASPER_LIBRARY AND JASPER_INCLUDE_DIR) -