summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorLubos Dolezel <lubos@dolezel.info>2015-06-02 20:14:58 +0200
committerLubos Dolezel <lubos@dolezel.info>2015-06-02 20:14:58 +0200
commit35c23e3d20a976de9736dff9c587a8f0408bf01a (patch)
tree6bcb8655f7a39ccf18ebb82462145a3bda4482e4 /cmake
parentab83223e1b5c7d34855d091e0c868462bd9452d1 (diff)
downloadtwinkle-35c23e3d20a976de9736dff9c587a8f0408bf01a.tar
twinkle-35c23e3d20a976de9736dff9c587a8f0408bf01a.tar.gz
twinkle-35c23e3d20a976de9736dff9c587a8f0408bf01a.tar.lz
twinkle-35c23e3d20a976de9736dff9c587a8f0408bf01a.tar.xz
twinkle-35c23e3d20a976de9736dff9c587a8f0408bf01a.zip
Fixed optional feature enabling
Hide Diamondcard support Other fixes
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindSpeex.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/cmake/FindSpeex.cmake b/cmake/FindSpeex.cmake
index ff801fa..7a9c2d4 100644
--- a/cmake/FindSpeex.cmake
+++ b/cmake/FindSpeex.cmake
@@ -1,9 +1,11 @@
FIND_PATH(SPEEX_INCLUDE_DIR speex/speex.h)
-FIND_LIBRARY(SPEEX_LIBRARIES NAMES speex)
+FIND_LIBRARY(SPEEX_LIBRARY NAMES speex)
+FIND_LIBRARY(SPEEXDSP_LIBRARY NAMES speexdsp)
-IF(SPEEX_INCLUDE_DIR AND SPEEX_LIBRARIES)
+IF(SPEEX_INCLUDE_DIR AND SPEEX_LIBRARY AND SPEEXDSP_LIBRARY)
SET(SPEEX_FOUND TRUE)
-ENDIF(SPEEX_INCLUDE_DIR AND SPEEX_LIBRARIES)
+ SET(SPEEX_LIBRARIES ${SPEEX_LIBRARY} ${SPEEXDSP_LIBRARY})
+ENDIF(SPEEX_INCLUDE_DIR AND SPEEX_LIBRARY AND SPEEXDSP_LIBRARY)
IF(SPEEX_FOUND)
IF (NOT Speex_FIND_QUIETLY)