Changed: #842 FindSquish finds both release and debug libraries.
This commit is contained in:
parent
1322a9bbb1
commit
90f5d64709
1 changed files with 24 additions and 1 deletions
|
@ -24,7 +24,7 @@ FIND_PATH(SQUISH_INCLUDE_DIR
|
||||||
PATH_SUFFIXES cppunit
|
PATH_SUFFIXES cppunit
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(SQUISH_LIBRARY
|
FIND_LIBRARY(SQUISH_LIBRARY_RELEASE
|
||||||
squish
|
squish
|
||||||
PATHS
|
PATHS
|
||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
|
@ -38,6 +38,29 @@ FIND_LIBRARY(SQUISH_LIBRARY
|
||||||
/usr/freeware/lib64
|
/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)
|
IF(SQUISH_LIBRARY AND SQUISH_INCLUDE_DIR)
|
||||||
SET(SQUISH_FOUND "YES")
|
SET(SQUISH_FOUND "YES")
|
||||||
IF(NOT SQUISH_FIND_QUIETLY)
|
IF(NOT SQUISH_FIND_QUIETLY)
|
||||||
|
|
Loading…
Reference in a new issue