From 423329a28d3dea91cf2a56341469f689cc251ec1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 3 Jan 2011 22:16:24 +0300 Subject: [PATCH] Move CMake defines Signed-off-by: Peter Lemenkov --- CMakeLists.txt | 3 +++ core/CMakeLists.txt | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6f8c863..b8b09ce3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,7 @@ SET(CMAKE_VERBOSE_MAKEFILE ON) # (which means that current debian and gentoo packages don't work) IF(SEMS_USE_SPANDSP) FIND_PACKAGE(Spandsp REQUIRED) + ADD_DEFINITIONS(-DUSE_SPANDSP -D__STDC_LIMIT_MACROS) MESSAGE(STATUS "Using spandsp: YES") ELSE(SEMS_USE_SPANDSP) MESSAGE(STATUS "Using spandsp: NO (default)") @@ -98,6 +99,7 @@ ENDIF(SEMS_USE_SPANDSP) # (see http://www.mega-nerd.com/SRC/) IF(SEMS_USE_LIBSAMPLERATE) FIND_PACKAGE(Libsamplerate REQUIRED) + ADD_DEFINITIONS(-DUSE_LIBSAMPLERATE) MESSAGE(STATUS "Using libsamplerate: YES") ELSE(SEMS_USE_LIBSAMPLERATE) MESSAGE(STATUS "Using libsamplerate: NO (default)") @@ -137,6 +139,7 @@ ELSE(SEMS_USE_MONITORING) ENDIF(SEMS_USE_MONITORING) IF(SEMS_USE_IPV6) + ADD_DEFINITIONS(-DSUPPORT_IPV6) MESSAGE(STATUS "Enable IPv6 support: YES") ELSE(SEMS_USE_IPV6) MESSAGE(STATUS "Enable IPv6 support: NO (default)") diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index ad04b100..28ba4255 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -20,19 +20,13 @@ ENDIF(NOT MAX_RTP_SESSIONS) ADD_DEFINITIONS(-DMAX_RTP_SESSIONS=${MAX_RTP_SESSIONS}) IF(SPANDSP_FOUND) - ADD_DEFINITIONS(-DUSE_SPANDSP -D__STDC_LIMIT_MACROS) TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} spandsp) ENDIF(SPANDSP_FOUND) IF(LIBSAMPLERATE_FOUND) - ADD_DEFINITIONS(-DUSE_LIBSAMPLERATE) TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} samplerate) ENDIF(LIBSAMPLERATE_FOUND) -IF(SEMS_USE_IPV6) - ADD_DEFINITIONS(-DSUPPORT_IPV6) -ENDIF(SEMS_USE_IPV6) - ADD_SUBDIRECTORY(plug-in) # Create config-file from template