Commit 9eca0967 authored by Ghislain MARY's avatar Ghislain MARY

Merge remote-tracking branch 'origin/master' into dev_dtls

parents d2467bab fb773899
......@@ -27,13 +27,6 @@
# ORTP_LIBRARIES - The libraries needed to use oRTP
# ORTP_CPPFLAGS - The cflags needed to use oRTP
if(@ENABLE_SRTP@)
find_package(SRTP)
endif()
if(@ENABLE_ZRTP@)
find_package(BZRTP)
endif()
set(_ORTP_ROOT_PATHS
${WITH_ORTP}
${CMAKE_INSTALL_PREFIX}
......@@ -55,14 +48,6 @@ find_library(ORTP_LIBRARIES
PATH_SUFFIXES bin lib
)
if(SRTP_FOUND)
list(APPEND ORTP_INCLUDE_DIRS ${SRTP_INCLUDE_DIRS})
list(APPEND ORTP_LIBRARIES ${SRTP_LIBRARIES})
endif()
if(BZRTP_FOUND)
list(APPEND ORTP_INCLUDE_DIRS ${BZRTP_INCLUDE_DIRS})
list(APPEND ORTP_LIBRARIES ${BZRTP_LIBRARIES})
endif()
if(WIN32)
list(APPEND ORTP_LIBRARIES ws2_32 delayimp Winmm Qwave)
endif(WIN32)
......
......@@ -59,5 +59,3 @@
#cmakedefine ORTP_DEFAULT_THREAD_STACK_SIZE ${ORTP_DEFAULT_THREAD_STACK_SIZE}
#cmakedefine POSIXTIMER_INTERVAL ${POSIXTIMER_INTERVAL}
#cmakedefine __APPLE_USE_RFC_2292
#cmakedefine HAVE_SRTP
......@@ -71,7 +71,7 @@ if(ENABLE_STATIC)
target_link_libraries(ortp ${LIBS})
else()
add_library(ortp SHARED ${SOURCE_FILES})
set_target_properties(ortp PROPERTIES VERSION ${ORTP_VERSION} SOVERSION ${ORTP_SO_VERSION})
set_target_properties(ortp PROPERTIES VERSION ${ORTP_SO_VERSION})
target_link_libraries(ortp ${LIBS})
if(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment