Changeset 1443:95f48b2b5385 in mediastreamer2 for src/CMakeLists.txt

Timestamp:

May 9, 2012 1:46:12 PM (13 months ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Message:

if speex is not found in root_path, use the internal one

File:

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

src/CMakeLists.txt

@@ -68 +68 @@
 endif(WIN32)
 
-find_file(GSM_GSM_H gsm/gsm.h PATHS ${GSM_INCLUDE_DIRS} CMAKE_FIND_ROOT_PATH_BOTH)
+find_file(GSM_GSM_H gsm/gsm.h PATHS ${GSM_INCLUDE_DIRS})
 if(GSM_GSM_H)
   find_library(GSM_LIB gsm)
@@ -83 +83 @@
 endif(GSM_LIB)
 
-find_file(SPEEX_H speex/speex.h PATHS ${SPEEX_INCLUDE_DIRS} CMAKE_FIND_ROOT_PATH_BOTH)
+find_file(SPEEX_H speex/speex.h PATHS ${SPEEX_INCLUDE_DIRS})
+if(NOT SPEEX_H)
+  set(SPEEX_H "${SPEEX_INCLUDE_DIRS}/speex/speex.h")
+endif()
+
+
 if(SPEEX_H)
   set(MS_LIBS  ${MS_LIBS} ${SPEEX_LIBRARIES} ${SPEEXDSP_LIBRARIES})