From 90f5d64709761a27b7ce11a52d46963f3e7d7636 Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Wed, 15 Sep 2010 20:28:15 -0500 Subject: [PATCH] Changed: #842 FindSquish finds both release and debug libraries. --- code/CMakeModules/FindSquish.cmake | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/code/CMakeModules/FindSquish.cmake b/code/CMakeModules/FindSquish.cmake index 2fcbc1a1a..57cde5793 100644 --- a/code/CMakeModules/FindSquish.cmake +++ b/code/CMakeModules/FindSquish.cmake @@ -24,7 +24,7 @@ FIND_PATH(SQUISH_INCLUDE_DIR PATH_SUFFIXES cppunit ) -FIND_LIBRARY(SQUISH_LIBRARY +FIND_LIBRARY(SQUISH_LIBRARY_RELEASE squish PATHS /usr/local/lib @@ -38,6 +38,29 @@ FIND_LIBRARY(SQUISH_LIBRARY /usr/freeware/lib64 ) +FIND_LIBRARY(SQUISH_LIBRARY_DEBUG + squishd + PATHS + /usr/local/lib + /usr/lib + /usr/local/X11R6/lib + /usr/X11R6/lib + /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 +) + +IF(SQUISH_LIBRARY_RELEASE) + SET(STLPORT_FOUND "YES") + + SET(SQUISH_LIBRARY "optimized;${SQUISH_LIBRARY_RELEASE}") + IF(SQUISH_LIBRARY_DEBUG) + SET(SQUISH_LIBRARY ";debug;${SQUISH_LIBRARY_DEBUG}") + ENDIF(SQUISH_LIBRARY_DEBUG) +ENDIF(SQUISH_LIBRARY_RELEASE) + IF(SQUISH_LIBRARY AND SQUISH_INCLUDE_DIR) SET(SQUISH_FOUND "YES") IF(NOT SQUISH_FIND_QUIETLY)