Changeset 1055:05c1d7eaaaa0 in mediastreamer2

Timestamp:

Sep 7, 2010 11:13:06 AM (3 years ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Message:

adding speexdsp

File:

• src/CMakeLists.txt (modified) (2 diffs)

src/CMakeLists.txt

@@ -32 +32 @@
 endif(WIN32)
 
-find_file(GSM_GSM_H gsm/gsm.h)
+find_file(GSM_GSM_H gsm/gsm.h PATHS ${GSM_INCLUDE_PATH})
 if(GSM_GSM_H)
   find_library(GSM_LIB gsm)
@@ -46 +46 @@
 endif(GSM_LIB)
 
-find_file(SPEEX_H speex/speex.h)
+find_file(SPEEX_H speex/speex.h PATHS ${SPEEX_INCLUDE_DIRS})
 if(SPEEX_H)
-  find_library(SPEEX_LIB speex)
-  find_library(SPEEXDSP_LIB speexdsp)
+  set(MS_LIBS  ${MS_LIBS} ${SPEEX_LIBRARIES} ${SPEEXDSP_LIBRARIES})
+  set(MS_SRCS ${MS_SRCS} msspeex.c msresample.c)
+  include_directories(${SPEEX_INCLUDE_DIRS})
 endif(SPEEX_H)
-
-if(SPEEX_LIB)
-  set(MS_LIBS  ${MS_LIBS} ${SPEEX_LIB} ${SPEEXDSP_LIB})
-  set(MS_SRCS ${MS_SRCS} msresample.c msspeex.c)
-endif(SPEEX_LIB)