Module: sems
Branch: master
Commit: 23b4bae90a716eba286cf312f724a42dce8a02f2
URL:    
http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=23b4bae90a716eba286cf312f724a42dce8a02f2

Author: Peter Lemenkov <[email protected]>
Committer: Peter Lemenkov <[email protected]>
Date:   Thu Apr  5 17:06:18 2012 +0400

Add libzrtp support to the CMakeFile

Signed-off-by: Peter Lemenkov <[email protected]>

---

 CMakeLists.txt          |    4 +---
 cmake/FindLibzrtp.cmake |   17 +++++++++++++++++
 core/CMakeLists.txt     |    8 ++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3718bfe..c69c4f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,12 +108,10 @@ ENDIF(SEMS_USE_LIBSAMPLERATE)
 
 # ZRTP support? (see zfoneproject.com)
 IF(SEMS_USE_ZRTP)
-       # TODO
-       SET(ZRTP_FOUND TRUE)
+       FIND_PACKAGE(Libzrtp REQUIRED)
        MESSAGE(STATUS "Using libzrtp: YES")
        ADD_DEFINITIONS(-DWITH_ZRTP -DBUILD_ZRTP_MUTEXES -DBUILD_DEFAULT_CACHE 
-DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES)
 ELSE(SEMS_USE_ZRTP)
-       SET(ZRTP_FOUND FALSE)
        MESSAGE(STATUS "Using libzrtp: NO (default)")
 ENDIF(SEMS_USE_ZRTP)
 
diff --git a/cmake/FindLibzrtp.cmake b/cmake/FindLibzrtp.cmake
new file mode 100644
index 0000000..967c9d4
--- /dev/null
+++ b/cmake/FindLibzrtp.cmake
@@ -0,0 +1,17 @@
+FIND_PATH(LIBZRTP_INCLUDE_DIR zrtp.h HINTS /usr/include/zrtp )
+FIND_LIBRARY(LIBZRTP_LIBRARIES NAMES zrtp)
+
+IF(LIBZRTP_INCLUDE_DIR AND LIBZRTP_LIBRARIES)
+       SET(LIBZRTP_FOUND TRUE)
+ENDIF(LIBZRTP_INCLUDE_DIR AND LIBZRTP_LIBRARIES)
+
+IF(LIBZRTP_FOUND)
+       IF (NOT Libzrtp_FIND_QUIETLY)
+               MESSAGE(STATUS "Found libzrtp includes: 
${LIBZRTP_INCLUDE_DIR}/zrtp/zrtp.h")
+               MESSAGE(STATUS "Found libzrtp library: ${LIBZRTP_LIBRARIES}")
+       ENDIF (NOT Libzrtp_FIND_QUIETLY)
+ELSE(LIBZRTP_FOUND)
+       IF (Libzrtp_FIND_REQUIRED)
+               MESSAGE(FATAL_ERROR "Could NOT find libzrtp development files")
+       ENDIF (Libzrtp_FIND_REQUIRED)
+ENDIF(LIBZRTP_FOUND)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index e1eb469..bd107c8 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -27,6 +27,10 @@ IF(LIBSAMPLERATE_FOUND)
        TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} samplerate)
 ENDIF(LIBSAMPLERATE_FOUND)
 
+IF(LIBZRTP_FOUND)
+       TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} zrtp)
+ENDIF(LIBZRTP_FOUND)
+
 ADD_SUBDIRECTORY(plug-in)
 
 # Create config-file from template
@@ -39,9 +43,9 @@ INSTALL(TARGETS sems RUNTIME DESTINATION 
${SEMS_EXEC_PREFIX}/sbin)
 # Installation of config-files
 INSTALL(FILES ./etc/sems.conf DESTINATION ${SEMS_CFG_PREFIX}/etc/sems/)
 INSTALL(FILES ./etc/app_mapping.conf DESTINATION 
${SEMS_CFG_PREFIX}/etc/sems/etc/)
-IF(ZRTP_FOUND)
+IF(LIBZRTP_FOUND)
 INSTALL(FILES ./etc/zrtp.conf DESTINATION ${SEMS_CFG_PREFIX}/etc/sems/etc/)
-ENDIF(ZRTP_FOUND)
+ENDIF(LIBZRTP_FOUND)
 
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt)
 

_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to