From a7ee9ca66c2a085d2c34d32c319eb9b0c2839cff Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 8 Oct 2009 14:39:02 +0000 Subject: [PATCH] - Simplified CMake files for building libraries and plugins. - Ability to override installation directories. Signed-off-by: Peter Lemenkov git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1509 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- CMakeLists.txt | 17 ++++++++++------- apps/ann_b2b/CMakeLists.txt | 3 +-- apps/announce_transfer/CMakeLists.txt | 3 +-- apps/announcement/CMakeLists.txt | 3 +-- apps/annrecorder/CMakeLists.txt | 3 +-- apps/auth_b2b/CMakeLists.txt | 3 +-- apps/call_timer/CMakeLists.txt | 3 +-- apps/callback/CMakeLists.txt | 3 +-- apps/click2dial/CMakeLists.txt | 3 +-- apps/conference/CMakeLists.txt | 3 +-- apps/diameter_client/CMakeLists.txt | 3 +-- apps/diameter_client/lib_dbase/CMakeLists.txt | 5 +---- apps/dsm/CMakeLists.txt | 3 +-- apps/dsm/mods/mod_aws/CMakeLists.txt | 1 - apps/dsm/mods/mod_conference/CMakeLists.txt | 3 +-- apps/dsm/mods/mod_dlg/CMakeLists.txt | 3 +-- apps/dsm/mods/mod_monitoring/CMakeLists.txt | 3 +-- apps/dsm/mods/mod_mysql/CMakeLists.txt | 3 +-- apps/dsm/mods/mod_sys/CMakeLists.txt | 3 +-- apps/dsm/mods/mod_uri/CMakeLists.txt | 3 +-- apps/dsm/mods/mod_utils/CMakeLists.txt | 3 +-- apps/early_announce/CMakeLists.txt | 3 +-- apps/gateway/CMakeLists.txt | 3 +-- apps/ivr/CMakeLists.txt | 3 +-- apps/monitoring/CMakeLists.txt | 3 +-- apps/mp3/CMakeLists.txt | 3 +-- apps/msg_storage/CMakeLists.txt | 3 +-- apps/precoded_announce/CMakeLists.txt | 3 +-- apps/reg_agent/CMakeLists.txt | 3 +-- apps/registrar_client/CMakeLists.txt | 3 +-- apps/sw_prepaid_sip/CMakeLists.txt | 3 +-- apps/voicebox/CMakeLists.txt | 3 +-- apps/voicemail/CMakeLists.txt | 3 +-- apps/webconference/CMakeLists.txt | 3 +-- apps/xmlrpc2di/CMakeLists.txt | 3 +-- apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt | 7 ++----- core/CMakeLists.txt | 2 +- core/plug-in/adpcm/CMakeLists.txt | 3 +-- core/plug-in/binrpcctrl/CMakeLists.txt | 3 +-- .../binrpcctrl/libbinrpc/src/CMakeLists.txt | 2 -- core/plug-in/echo/CMakeLists.txt | 3 +-- core/plug-in/g722/CMakeLists.txt | 3 +-- core/plug-in/gsm/CMakeLists.txt | 6 +++--- core/plug-in/ilbc/CMakeLists.txt | 3 +-- core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt | 5 +---- core/plug-in/l16/CMakeLists.txt | 3 +-- core/plug-in/session_timer/CMakeLists.txt | 3 +-- core/plug-in/sipctrl/CMakeLists.txt | 3 +-- core/plug-in/speex/CMakeLists.txt | 6 +++--- core/plug-in/stats/CMakeLists.txt | 5 ++--- core/plug-in/uac_auth/CMakeLists.txt | 3 +-- core/plug-in/wav/CMakeLists.txt | 3 +-- 52 files changed, 65 insertions(+), 117 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09a3234b..017a9d06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,26 +28,29 @@ OPTION(SEMS_USE_MONITORING "Build with monitoring support" OFF) OPTION(SEMS_USE_IPV6 "Build with IPv6 support" OFF) OPTION(MAX_RTP_SESSIONS:int "How many rtp sessions SEMS will handle simultaneously? (default 2048)" 2048) -OPTION(SEMS_CFG_PREFIX:string "none" /usr/local) -OPTION(SEMS_AUDIO_PREFIX:string "none" /usr/local) -OPTION(SEMS_EXEC_PREFIX:string "none" /usr/local) -OPTION(SEMS_LIBDIR:string "none" lib) + +# add -lm and -lpthread to all targets +SET(CMAKE_DL_LIBS ${CMAKE_DL_LIBS} m pthread) IF (NOT SEMS_CFG_PREFIX) SET(SEMS_CFG_PREFIX "/usr/local") ENDIF (NOT SEMS_CFG_PREFIX) +MESSAGE(STATUS "SEMS cfg prefix was set to: ${SEMS_CFG_PREFIX}") IF (NOT SEMS_AUDIO_PREFIX) - SET(SEMS_AUDIO_PREFIX "/usr/local") + SET(SEMS_AUDIO_PREFIX "/usr/local/lib") ENDIF (NOT SEMS_AUDIO_PREFIX) +MESSAGE(STATUS "SEMS audio prefix was set to: ${SEMS_AUDIO_PREFIX}") IF (NOT SEMS_EXEC_PREFIX) SET(SEMS_EXEC_PREFIX "/usr/local") ENDIF (NOT SEMS_EXEC_PREFIX) +MESSAGE(STATUS "SEMS exec prefix was set to: ${SEMS_EXEC_PREFIX}") IF (NOT SEMS_LIBDIR) SET(SEMS_LIBDIR "lib") ENDIF (NOT SEMS_LIBDIR) +MESSAGE(STATUS "SEMS libdir was set to: ${SEMS_LIBDIR}") SET(CMAKE_VERBOSE_MAKEFILE ON) @@ -149,10 +152,10 @@ ENDIF (GSM_INCLUDE_DIR AND GSM_LIBRARIES) # Let's try to find SPEEX library and header files FIND_LIBRARY(SPEEX_LIBRARIES NAMES speex) -FIND_PATH(SPEEX_INCLUDE_DIR speex.h) +FIND_PATH(SPEEX_INCLUDE_DIR speex/speex.h) IF(SPEEX_INCLUDE_DIR AND SPEEX_LIBRARIES) SET(SPEEX_FOUND TRUE) - MESSAGE(STATUS "Found speex includes: ${SPEEX_INCLUDE_DIR}/speex.h") + MESSAGE(STATUS "Found speex includes: ${SPEEX_INCLUDE_DIR}/speex/speex.h") MESSAGE(STATUS "Found speex library: ${SPEEX_LIBRARIES}") MESSAGE(STATUS "Using speex: YES") ELSE(SPEEX_INCLUDE_DIR AND SPEEX_LIBRARIES) diff --git a/apps/ann_b2b/CMakeLists.txt b/apps/ann_b2b/CMakeLists.txt index 0f7143d3..a87b98be 100644 --- a/apps/ann_b2b/CMakeLists.txt +++ b/apps/ann_b2b/CMakeLists.txt @@ -3,6 +3,5 @@ AnnounceB2B.cpp ) ADD_LIBRARY(ann_b2b SHARED ${ann_b2b_SRCS}) -SET_TARGET_PROPERTIES(ann_b2b PROPERTIES OUTPUT_NAME "ann_b2b") -TARGET_LINK_LIBRARIES(ann_b2b ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(ann_b2b ${CMAKE_DL_LIBS}) diff --git a/apps/announce_transfer/CMakeLists.txt b/apps/announce_transfer/CMakeLists.txt index 1b9499c7..b990f228 100644 --- a/apps/announce_transfer/CMakeLists.txt +++ b/apps/announce_transfer/CMakeLists.txt @@ -3,6 +3,5 @@ AnnounceTransfer.cpp ) ADD_LIBRARY(announce_transfer SHARED ${announce_transfer_SRCS}) -SET_TARGET_PROPERTIES(announce_transfer PROPERTIES OUTPUT_NAME "announce_transfer") -TARGET_LINK_LIBRARIES(announce_transfer ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(announce_transfer ${CMAKE_DL_LIBS}) diff --git a/apps/announcement/CMakeLists.txt b/apps/announcement/CMakeLists.txt index a1134805..f8e6e307 100644 --- a/apps/announcement/CMakeLists.txt +++ b/apps/announcement/CMakeLists.txt @@ -3,6 +3,5 @@ Announcement.cpp ) ADD_LIBRARY(announcement SHARED ${announcement_SRCS}) -SET_TARGET_PROPERTIES(announcement PROPERTIES OUTPUT_NAME "announcement") -TARGET_LINK_LIBRARIES(announcement ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(announcement ${CMAKE_DL_LIBS}) diff --git a/apps/annrecorder/CMakeLists.txt b/apps/annrecorder/CMakeLists.txt index ddda6f39..6dffcb5d 100644 --- a/apps/annrecorder/CMakeLists.txt +++ b/apps/annrecorder/CMakeLists.txt @@ -3,6 +3,5 @@ AnnRecorder.cpp ) ADD_LIBRARY(annrecorder SHARED ${annrecorder_SRCS}) -SET_TARGET_PROPERTIES(annrecorder PROPERTIES OUTPUT_NAME "annrecorder") -TARGET_LINK_LIBRARIES(annrecorder ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(annrecorder ${CMAKE_DL_LIBS}) diff --git a/apps/auth_b2b/CMakeLists.txt b/apps/auth_b2b/CMakeLists.txt index 0dd916e8..48bcb8cc 100644 --- a/apps/auth_b2b/CMakeLists.txt +++ b/apps/auth_b2b/CMakeLists.txt @@ -5,6 +5,5 @@ AuthB2B.cpp ADD_DEFINITIONS(-DMOD_NAME="auth_b2b") ADD_LIBRARY(auth_b2b SHARED ${auth_b2b_SRCS}) -SET_TARGET_PROPERTIES(auth_b2b PROPERTIES OUTPUT_NAME "auth_b2b") -TARGET_LINK_LIBRARIES(auth_b2b ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(auth_b2b ${CMAKE_DL_LIBS}) diff --git a/apps/call_timer/CMakeLists.txt b/apps/call_timer/CMakeLists.txt index d8127b13..c6a1a35f 100644 --- a/apps/call_timer/CMakeLists.txt +++ b/apps/call_timer/CMakeLists.txt @@ -5,6 +5,5 @@ CallTimer.cpp ADD_DEFINITIONS(-DMOD_NAME="call_timer") ADD_LIBRARY(call_timer SHARED ${call_timer_SRCS}) -SET_TARGET_PROPERTIES(call_timer PROPERTIES OUTPUT_NAME "call_timer") -TARGET_LINK_LIBRARIES(call_timer ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(call_timer ${CMAKE_DL_LIBS}) diff --git a/apps/callback/CMakeLists.txt b/apps/callback/CMakeLists.txt index 7b4df621..b0a45f23 100644 --- a/apps/callback/CMakeLists.txt +++ b/apps/callback/CMakeLists.txt @@ -5,6 +5,5 @@ CallBack.cpp ADD_DEFINITIONS(-DMOD_NAME="callback") ADD_LIBRARY(callback SHARED ${callback_SRCS}) -SET_TARGET_PROPERTIES(callback PROPERTIES OUTPUT_NAME "callback") -TARGET_LINK_LIBRARIES(callback ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(callback ${CMAKE_DL_LIBS}) diff --git a/apps/click2dial/CMakeLists.txt b/apps/click2dial/CMakeLists.txt index a6803021..b3383bdb 100644 --- a/apps/click2dial/CMakeLists.txt +++ b/apps/click2dial/CMakeLists.txt @@ -3,6 +3,5 @@ Click2Dial.cpp ) ADD_LIBRARY(click2dial SHARED ${click2dial_SRCS}) -SET_TARGET_PROPERTIES(click2dial PROPERTIES OUTPUT_NAME "click2dial") -TARGET_LINK_LIBRARIES(click2dial ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(click2dial ${CMAKE_DL_LIBS}) diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt index 70e0476a..e9480d5d 100644 --- a/apps/conference/CMakeLists.txt +++ b/apps/conference/CMakeLists.txt @@ -3,8 +3,7 @@ Conference.cpp ) ADD_LIBRARY(conference SHARED ${conference_SRCS}) -SET_TARGET_PROPERTIES(conference PROPERTIES OUTPUT_NAME "conference") -TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS}) IF(FLITE_FOUND AND ZRTP_FOUND) INCLUDE_DIRECTORIES(${FLITE_INCLUDE_DIR}/flite) diff --git a/apps/diameter_client/CMakeLists.txt b/apps/diameter_client/CMakeLists.txt index 3e20afd4..cbf8f932 100644 --- a/apps/diameter_client/CMakeLists.txt +++ b/apps/diameter_client/CMakeLists.txt @@ -9,8 +9,7 @@ INCLUDE_DIRECTORIES (lib_dbase) SET_PROPERTY(TARGET libdbase PROPERTY IMPORTED_LOCATION ./lib_dbase/libdbase.a) ADD_LIBRARY(diameter_client SHARED ${diameter_client_SRCS}) -SET_TARGET_PROPERTIES(diameter_client PROPERTIES OUTPUT_NAME "diameter_client") -TARGET_LINK_LIBRARIES(diameter_client ${CMAKE_DL_LIBS} pthread m libdbase) +TARGET_LINK_LIBRARIES(diameter_client ${CMAKE_DL_LIBS} libdbase) IF(OPENSSL_FOUND) ADD_DEFINITIONS(-DWITH_OPENSSL) diff --git a/apps/diameter_client/lib_dbase/CMakeLists.txt b/apps/diameter_client/lib_dbase/CMakeLists.txt index be4ace2a..fabd6f86 100644 --- a/apps/diameter_client/lib_dbase/CMakeLists.txt +++ b/apps/diameter_client/lib_dbase/CMakeLists.txt @@ -4,13 +4,10 @@ diameter_msg.c tcp_comm.c ) -SET(CMAKE_VERBOSE_MAKEFILE ON) - IF(OPENSSL_FOUND) ADD_DEFINITIONS(-DWITH_OPENSSL) ENDIF(OPENSSL_FOUND) add_library(libdbase STATIC ${libdbase_SRCS}) -set_target_properties(libdbase PROPERTIES OUTPUT_NAME "libdbase") -target_link_libraries(libdbase ${CMAKE_DL_LIBS} pthread m) +target_link_libraries(libdbase ${CMAKE_DL_LIBS}) diff --git a/apps/dsm/CMakeLists.txt b/apps/dsm/CMakeLists.txt index 8f8e45a3..114b2bfb 100644 --- a/apps/dsm/CMakeLists.txt +++ b/apps/dsm/CMakeLists.txt @@ -15,6 +15,5 @@ INCLUDE_DIRECTORIES (.) ADD_SUBDIRECTORY (mods) ADD_LIBRARY(dsm SHARED ${dsm_SRCS}) -SET_TARGET_PROPERTIES(dsm PROPERTIES OUTPUT_NAME "dsm") -TARGET_LINK_LIBRARIES(dsm ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(dsm ${CMAKE_DL_LIBS}) diff --git a/apps/dsm/mods/mod_aws/CMakeLists.txt b/apps/dsm/mods/mod_aws/CMakeLists.txt index 4e4bc21f..ca93bfa0 100644 --- a/apps/dsm/mods/mod_aws/CMakeLists.txt +++ b/apps/dsm/mods/mod_aws/CMakeLists.txt @@ -3,6 +3,5 @@ ModAws.cpp ) ADD_LIBRARY(mod_aws SHARED ${mod_aws_SRCS}) -SET_TARGET_PROPERTIES(mod_aws PROPERTIES OUTPUT_NAME "mod_aws") TARGET_LINK_LIBRARIES(mod_aws ${CMAKE_DL_LIBS} aws) diff --git a/apps/dsm/mods/mod_conference/CMakeLists.txt b/apps/dsm/mods/mod_conference/CMakeLists.txt index 6d948924..9b575016 100644 --- a/apps/dsm/mods/mod_conference/CMakeLists.txt +++ b/apps/dsm/mods/mod_conference/CMakeLists.txt @@ -3,6 +3,5 @@ ModConference.cpp ) ADD_LIBRARY(mod_conference SHARED ${mod_conference_SRCS}) -SET_TARGET_PROPERTIES(mod_conference PROPERTIES OUTPUT_NAME "mod_conference") -TARGET_LINK_LIBRARIES(mod_conference ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(mod_conference ${CMAKE_DL_LIBS}) diff --git a/apps/dsm/mods/mod_dlg/CMakeLists.txt b/apps/dsm/mods/mod_dlg/CMakeLists.txt index 9b8c9e17..158f43dc 100644 --- a/apps/dsm/mods/mod_dlg/CMakeLists.txt +++ b/apps/dsm/mods/mod_dlg/CMakeLists.txt @@ -3,6 +3,5 @@ ModDlg.cpp ) ADD_LIBRARY(mod_dlg SHARED ${mod_dlg_SRCS}) -SET_TARGET_PROPERTIES(mod_dlg PROPERTIES OUTPUT_NAME "mod_dlg") -TARGET_LINK_LIBRARIES(mod_dlg ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(mod_dlg ${CMAKE_DL_LIBS}) diff --git a/apps/dsm/mods/mod_monitoring/CMakeLists.txt b/apps/dsm/mods/mod_monitoring/CMakeLists.txt index 99e682ef..cf81f768 100644 --- a/apps/dsm/mods/mod_monitoring/CMakeLists.txt +++ b/apps/dsm/mods/mod_monitoring/CMakeLists.txt @@ -3,6 +3,5 @@ ModMonitoring.cpp ) ADD_LIBRARY(mod_monitoring SHARED ${mod_monitoring_SRCS}) -SET_TARGET_PROPERTIES(mod_monitoring PROPERTIES OUTPUT_NAME "mod_monitoring") -TARGET_LINK_LIBRARIES(mod_monitoring ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(mod_monitoring ${CMAKE_DL_LIBS}) diff --git a/apps/dsm/mods/mod_mysql/CMakeLists.txt b/apps/dsm/mods/mod_mysql/CMakeLists.txt index 5a81e556..a9727600 100644 --- a/apps/dsm/mods/mod_mysql/CMakeLists.txt +++ b/apps/dsm/mods/mod_mysql/CMakeLists.txt @@ -6,6 +6,5 @@ INCLUDE_DIRECTORIES(/usr/include/mysql) INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++) ADD_LIBRARY(mod_mysql SHARED ${mod_mysql_SRCS}) -SET_TARGET_PROPERTIES(mod_mysql PROPERTIES OUTPUT_NAME "mod_mysql") -TARGET_LINK_LIBRARIES(mod_mysql ${CMAKE_DL_LIBS} pthread m mysqlpp) +TARGET_LINK_LIBRARIES(mod_mysql ${CMAKE_DL_LIBS} mysqlpp) diff --git a/apps/dsm/mods/mod_sys/CMakeLists.txt b/apps/dsm/mods/mod_sys/CMakeLists.txt index 37e268d1..9f2711c8 100644 --- a/apps/dsm/mods/mod_sys/CMakeLists.txt +++ b/apps/dsm/mods/mod_sys/CMakeLists.txt @@ -3,6 +3,5 @@ ModSys.cpp ) ADD_LIBRARY(mod_sys SHARED ${mod_sys_SRCS}) -SET_TARGET_PROPERTIES(mod_sys PROPERTIES OUTPUT_NAME "mod_sys") -TARGET_LINK_LIBRARIES(mod_sys ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(mod_sys ${CMAKE_DL_LIBS}) diff --git a/apps/dsm/mods/mod_uri/CMakeLists.txt b/apps/dsm/mods/mod_uri/CMakeLists.txt index f71eedc7..24269192 100644 --- a/apps/dsm/mods/mod_uri/CMakeLists.txt +++ b/apps/dsm/mods/mod_uri/CMakeLists.txt @@ -3,6 +3,5 @@ ModUri.cpp ) ADD_LIBRARY(mod_uri SHARED ${mod_uri_SRCS}) -SET_TARGET_PROPERTIES(mod_uri PROPERTIES OUTPUT_NAME "mod_uri") -TARGET_LINK_LIBRARIES(mod_uri ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(mod_uri ${CMAKE_DL_LIBS}) diff --git a/apps/dsm/mods/mod_utils/CMakeLists.txt b/apps/dsm/mods/mod_utils/CMakeLists.txt index 3f4aa862..3f58ebd0 100644 --- a/apps/dsm/mods/mod_utils/CMakeLists.txt +++ b/apps/dsm/mods/mod_utils/CMakeLists.txt @@ -3,6 +3,5 @@ ModUtils.cpp ) ADD_LIBRARY(mod_utils SHARED ${mod_utils_SRCS}) -SET_TARGET_PROPERTIES(mod_utils PROPERTIES OUTPUT_NAME "mod_utils") -TARGET_LINK_LIBRARIES(mod_utils ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(mod_utils ${CMAKE_DL_LIBS}) diff --git a/apps/early_announce/CMakeLists.txt b/apps/early_announce/CMakeLists.txt index 74ea871c..f7de3a0e 100644 --- a/apps/early_announce/CMakeLists.txt +++ b/apps/early_announce/CMakeLists.txt @@ -3,8 +3,7 @@ EarlyAnnounce.cpp ) ADD_LIBRARY(early_announce SHARED ${early_announce_SRCS}) -SET_TARGET_PROPERTIES(early_announce PROPERTIES OUTPUT_NAME "early_announce") -TARGET_LINK_LIBRARIES(early_announce ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(early_announce ${CMAKE_DL_LIBS}) IF(MYSQLPP_FOUND) INCLUDE_DIRECTORIES(/usr/include/mysql) diff --git a/apps/gateway/CMakeLists.txt b/apps/gateway/CMakeLists.txt index 7cd36b16..ae9ce5f7 100644 --- a/apps/gateway/CMakeLists.txt +++ b/apps/gateway/CMakeLists.txt @@ -10,6 +10,5 @@ ADD_DEFINITIONS(-DGW_VERSION="0.1") INCLUDE_DIRECTORIES(${MISDN_INCLUDE_DIR}/mISDNuser) ADD_LIBRARY(gateway SHARED ${gateway_SRCS}) -SET_TARGET_PROPERTIES(gateway PROPERTIES OUTPUT_NAME "gateway") -TARGET_LINK_LIBRARIES(gateway ${CMAKE_DL_LIBS} pthread m mISDN isdnnet) +TARGET_LINK_LIBRARIES(gateway ${CMAKE_DL_LIBS} mISDN isdnnet) diff --git a/apps/ivr/CMakeLists.txt b/apps/ivr/CMakeLists.txt index 01f75ffb..ca32a66f 100644 --- a/apps/ivr/CMakeLists.txt +++ b/apps/ivr/CMakeLists.txt @@ -12,8 +12,7 @@ IvrUAC.cpp INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) ADD_LIBRARY(ivr SHARED ${ivr_SRCS}) -SET_TARGET_PROPERTIES(ivr PROPERTIES OUTPUT_NAME "ivr") -TARGET_LINK_LIBRARIES(ivr ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(ivr ${CMAKE_DL_LIBS}) IF(FLITE_FOUND) INCLUDE_DIRECTORIES(${FLITE_INCLUDE_DIR}/flite) diff --git a/apps/monitoring/CMakeLists.txt b/apps/monitoring/CMakeLists.txt index 529fef58..b0b4b98a 100644 --- a/apps/monitoring/CMakeLists.txt +++ b/apps/monitoring/CMakeLists.txt @@ -5,6 +5,5 @@ Monitoring.cpp ADD_DEFINITIONS(-DMOD_NAME="monitoring") ADD_LIBRARY(monitoring SHARED ${monitoring_SRCS}) -SET_TARGET_PROPERTIES(monitoring PROPERTIES OUTPUT_NAME "monitoring") -TARGET_LINK_LIBRARIES(monitoring ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(monitoring ${CMAKE_DL_LIBS}) diff --git a/apps/mp3/CMakeLists.txt b/apps/mp3/CMakeLists.txt index fb808518..a3642953 100644 --- a/apps/mp3/CMakeLists.txt +++ b/apps/mp3/CMakeLists.txt @@ -7,6 +7,5 @@ mp3.c # module_cflags += -DWITH_MPG123DECODER ADD_LIBRARY(mp3 SHARED ${mp3_SRCS}) -SET_TARGET_PROPERTIES(mp3 PROPERTIES OUTPUT_NAME "mp3") -TARGET_LINK_LIBRARIES(mp3 ${CMAKE_DL_LIBS} pthread m mp3lame) +TARGET_LINK_LIBRARIES(mp3 ${CMAKE_DL_LIBS} mp3lame) diff --git a/apps/msg_storage/CMakeLists.txt b/apps/msg_storage/CMakeLists.txt index 47fd08e1..4ef9dd67 100644 --- a/apps/msg_storage/CMakeLists.txt +++ b/apps/msg_storage/CMakeLists.txt @@ -9,6 +9,5 @@ MsgStorage.cpp ADD_DEFINITIONS(-DMOD_NAME="msg_storage") ADD_LIBRARY(msg_storage SHARED ${msg_storage_SRCS}) -SET_TARGET_PROPERTIES(msg_storage PROPERTIES OUTPUT_NAME "msg_storage") -TARGET_LINK_LIBRARIES(msg_storage ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(msg_storage ${CMAKE_DL_LIBS}) diff --git a/apps/precoded_announce/CMakeLists.txt b/apps/precoded_announce/CMakeLists.txt index 32bc678a..0fc212a7 100644 --- a/apps/precoded_announce/CMakeLists.txt +++ b/apps/precoded_announce/CMakeLists.txt @@ -5,6 +5,5 @@ PrecodedAnnounce.cpp ADD_DEFINITIONS(-DMOD_NAME="precoded_announce") ADD_LIBRARY(precoded_announce SHARED ${precoded_announce_SRCS}) -SET_TARGET_PROPERTIES(precoded_announce PROPERTIES OUTPUT_NAME "precoded_announce") -TARGET_LINK_LIBRARIES(precoded_announce ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(precoded_announce ${CMAKE_DL_LIBS}) diff --git a/apps/reg_agent/CMakeLists.txt b/apps/reg_agent/CMakeLists.txt index 2d5aec90..60f1c714 100644 --- a/apps/reg_agent/CMakeLists.txt +++ b/apps/reg_agent/CMakeLists.txt @@ -3,6 +3,5 @@ RegistrationAgent.cpp ) ADD_LIBRARY(reg_agent SHARED ${reg_agent_SRCS}) -SET_TARGET_PROPERTIES(reg_agent PROPERTIES OUTPUT_NAME "reg_agent") -TARGET_LINK_LIBRARIES(reg_agent ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(reg_agent ${CMAKE_DL_LIBS}) diff --git a/apps/registrar_client/CMakeLists.txt b/apps/registrar_client/CMakeLists.txt index 22cbcb44..bc859b81 100644 --- a/apps/registrar_client/CMakeLists.txt +++ b/apps/registrar_client/CMakeLists.txt @@ -4,6 +4,5 @@ SIPRegistrarClient.cpp ) ADD_LIBRARY(registrar_client SHARED ${registrar_client_SRCS}) -SET_TARGET_PROPERTIES(registrar_client PROPERTIES OUTPUT_NAME "registrar_client") -TARGET_LINK_LIBRARIES(registrar_client ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(registrar_client ${CMAKE_DL_LIBS}) diff --git a/apps/sw_prepaid_sip/CMakeLists.txt b/apps/sw_prepaid_sip/CMakeLists.txt index b40d61a7..efdc3e2e 100644 --- a/apps/sw_prepaid_sip/CMakeLists.txt +++ b/apps/sw_prepaid_sip/CMakeLists.txt @@ -3,6 +3,5 @@ SWPrepaidSIP.cpp ) ADD_LIBRARY(sw_prepaid_sip SHARED ${sw_prepaid_sip_SRCS}) -SET_TARGET_PROPERTIES(sw_prepaid_sip PROPERTIES OUTPUT_NAME "sw_prepaid_sip") -TARGET_LINK_LIBRARIES(sw_prepaid_sip ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(sw_prepaid_sip ${CMAKE_DL_LIBS}) diff --git a/apps/voicebox/CMakeLists.txt b/apps/voicebox/CMakeLists.txt index 4f8f1728..c56af098 100644 --- a/apps/voicebox/CMakeLists.txt +++ b/apps/voicebox/CMakeLists.txt @@ -4,6 +4,5 @@ VoiceboxDialog.cpp ) ADD_LIBRARY(voicebox SHARED ${voicebox_SRCS}) -SET_TARGET_PROPERTIES(voicebox PROPERTIES OUTPUT_NAME "voicebox") -TARGET_LINK_LIBRARIES(voicebox ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(voicebox ${CMAKE_DL_LIBS}) diff --git a/apps/voicemail/CMakeLists.txt b/apps/voicemail/CMakeLists.txt index 3cc7b412..7888483e 100644 --- a/apps/voicemail/CMakeLists.txt +++ b/apps/voicemail/CMakeLists.txt @@ -6,8 +6,7 @@ EmailTemplate.cpp ) ADD_LIBRARY(voicemail SHARED ${voicemail_SRCS}) -SET_TARGET_PROPERTIES(voicemail PROPERTIES OUTPUT_NAME "voicemail") -TARGET_LINK_LIBRARIES(voicemail ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(voicemail ${CMAKE_DL_LIBS}) # Currently cannot be build with mysql++ #IF(MYSQLPP_FOUND) diff --git a/apps/webconference/CMakeLists.txt b/apps/webconference/CMakeLists.txt index cb1f31a3..94941052 100644 --- a/apps/webconference/CMakeLists.txt +++ b/apps/webconference/CMakeLists.txt @@ -6,6 +6,5 @@ WebConferenceDialog.cpp ) ADD_LIBRARY(webconference SHARED ${webconference_SRCS}) -SET_TARGET_PROPERTIES(webconference PROPERTIES OUTPUT_NAME "webconference") -TARGET_LINK_LIBRARIES(webconference ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(webconference ${CMAKE_DL_LIBS}) diff --git a/apps/xmlrpc2di/CMakeLists.txt b/apps/xmlrpc2di/CMakeLists.txt index 6da64da9..7d455850 100644 --- a/apps/xmlrpc2di/CMakeLists.txt +++ b/apps/xmlrpc2di/CMakeLists.txt @@ -11,8 +11,7 @@ INCLUDE_DIRECTORIES (xmlrpc++/src) SET_PROPERTY(TARGET xmlrpcpp PROPERTY IMPORTED_LOCATION ./xmlrpc++/src/xmlrpcpp.a) ADD_LIBRARY(xmlrpc2di SHARED ${xmlrpc2di_SRCS}) -SET_TARGET_PROPERTIES(xmlrpc2di PROPERTIES OUTPUT_NAME "xmlrpc2di") -TARGET_LINK_LIBRARIES(xmlrpc2di ${CMAKE_DL_LIBS} pthread m xmlrpcpp) +TARGET_LINK_LIBRARIES(xmlrpc2di ${CMAKE_DL_LIBS} xmlrpcpp) IF(OPENSSL_FOUND) ADD_DEFINITIONS(-DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS) diff --git a/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt b/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt index 26bd339c..1b3f9f1a 100644 --- a/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt +++ b/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt @@ -13,14 +13,11 @@ XmlRpcUtil.cpp XmlRpcValue.cpp ) -SET(CMAKE_VERBOSE_MAKEFILE ON) - # Add your system-dependent network libs here. These are # only used to build the tests (your application will need them too). # Linux: none # Solaris: -lsocket -lnsl -add_library(xmlrpcpp STATIC ${xmlrpcpp_SRCS}) -set_target_properties(xmlrpcpp PROPERTIES OUTPUT_NAME "xmlrpcpp") -target_link_libraries(xmlrpcpp ${CMAKE_DL_LIBS} pthread m) +ADD_LIBRARY(xmlrpcpp STATIC ${xmlrpcpp_SRCS}) +TARGET_LINK_LIBRARIES(xmlrpcpp ${CMAKE_DL_LIBS}) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 3c63cbc3..3f773ac3 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -52,7 +52,7 @@ INCLUDE_DIRECTORIES (ampi) INCLUDE_DIRECTORIES (amci) ADD_EXECUTABLE (sems ${sems_SRCS}) -TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} pthread stdc++ m) +TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} stdc++) IF(NOT MAX_RTP_SESSIONS) SET(MAX_RTP_SESSIONS 2048) diff --git a/core/plug-in/adpcm/CMakeLists.txt b/core/plug-in/adpcm/CMakeLists.txt index 36e0cd57..e23d75e6 100644 --- a/core/plug-in/adpcm/CMakeLists.txt +++ b/core/plug-in/adpcm/CMakeLists.txt @@ -8,6 +8,5 @@ g72x.c ) ADD_LIBRARY(adpcm SHARED ${adpcm_SRCS}) -SET_TARGET_PROPERTIES(adpcm PROPERTIES OUTPUT_NAME "adpcm") -TARGET_LINK_LIBRARIES(adpcm ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(adpcm ${CMAKE_DL_LIBS}) diff --git a/core/plug-in/binrpcctrl/CMakeLists.txt b/core/plug-in/binrpcctrl/CMakeLists.txt index c57e0bf0..27ad778c 100644 --- a/core/plug-in/binrpcctrl/CMakeLists.txt +++ b/core/plug-in/binrpcctrl/CMakeLists.txt @@ -11,8 +11,7 @@ INCLUDE_DIRECTORIES (libbinrpc/include) SET_PROPERTY(TARGET libbinrpc PROPERTY IMPORTED_LOCATION ./libbinrpc/src/binrpcctrl.a) ADD_LIBRARY(binrpcctrl SHARED ${binrpcctrl_SRCS}) -SET_TARGET_PROPERTIES(binrpcctrl PROPERTIES OUTPUT_NAME "binrpcctrl") -TARGET_LINK_LIBRARIES(binrpcctrl ${CMAKE_DL_LIBS} pthread m libbinrpc) +TARGET_LINK_LIBRARIES(binrpcctrl ${CMAKE_DL_LIBS} libbinrpc) diff --git a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt index f7f430bb..ea84ce7d 100644 --- a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt +++ b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt @@ -12,8 +12,6 @@ time.c value.c ) -SET(CMAKE_VERBOSE_MAKEFILE ON) - ### # Used flags # diff --git a/core/plug-in/echo/CMakeLists.txt b/core/plug-in/echo/CMakeLists.txt index 24a98b3a..96c2f3ac 100644 --- a/core/plug-in/echo/CMakeLists.txt +++ b/core/plug-in/echo/CMakeLists.txt @@ -4,6 +4,5 @@ Echo.cpp ) ADD_LIBRARY(echo SHARED ${echo_SRCS}) -SET_TARGET_PROPERTIES(echo PROPERTIES OUTPUT_NAME "echo") -TARGET_LINK_LIBRARIES(echo ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(echo ${CMAKE_DL_LIBS}) diff --git a/core/plug-in/g722/CMakeLists.txt b/core/plug-in/g722/CMakeLists.txt index ebb96ee4..4b0c7c7f 100644 --- a/core/plug-in/g722/CMakeLists.txt +++ b/core/plug-in/g722/CMakeLists.txt @@ -4,6 +4,5 @@ g722.c #module_cflags = -ansi # -DNOFPU ADD_LIBRARY(g722 SHARED ${g722_SRCS}) -SET_TARGET_PROPERTIES(g722 PROPERTIES OUTPUT_NAME "g722") -TARGET_LINK_LIBRARIES(g722 ${CMAKE_DL_LIBS} pthread ${SPANDSP_LIBRARIES} m) +TARGET_LINK_LIBRARIES(g722 ${CMAKE_DL_LIBS} spandsp) diff --git a/core/plug-in/gsm/CMakeLists.txt b/core/plug-in/gsm/CMakeLists.txt index b5de11d5..e86ae0d5 100644 --- a/core/plug-in/gsm/CMakeLists.txt +++ b/core/plug-in/gsm/CMakeLists.txt @@ -4,7 +4,7 @@ set (gsm_SRCS INCLUDE_DIRECTORIES(${GSM_INCLUDE_DIR}) -ADD_LIBRARY(gsm SHARED ${gsm_SRCS}) -SET_TARGET_PROPERTIES(gsm PROPERTIES OUTPUT_NAME "gsm") -TARGET_LINK_LIBRARIES(gsm ${CMAKE_DL_LIBS} pthread ${GSM_LIBRARIES} m) +ADD_LIBRARY(libgsm SHARED ${gsm_SRCS}) +SET_TARGET_PROPERTIES(libgsm PROPERTIES OUTPUT_NAME "gsm") +TARGET_LINK_LIBRARIES(libgsm ${CMAKE_DL_LIBS} gsm) diff --git a/core/plug-in/ilbc/CMakeLists.txt b/core/plug-in/ilbc/CMakeLists.txt index a87ae21d..7ac11d55 100644 --- a/core/plug-in/ilbc/CMakeLists.txt +++ b/core/plug-in/ilbc/CMakeLists.txt @@ -9,6 +9,5 @@ INCLUDE_DIRECTORIES (iLBC_rfc3951) SET_PROPERTY(TARGET libilbc PROPERTY IMPORTED_LOCATION ./iLBC_rfc3951/ilbc.a) ADD_LIBRARY(ilbc SHARED ${ilbc_SRCS}) -SET_TARGET_PROPERTIES(ilbc PROPERTIES OUTPUT_NAME "ilbc") -TARGET_LINK_LIBRARIES(ilbc ${CMAKE_DL_LIBS} pthread m libilbc) +TARGET_LINK_LIBRARIES(ilbc ${CMAKE_DL_LIBS} libilbc) diff --git a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt index 8cea4851..e7146685 100644 --- a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt +++ b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt @@ -24,9 +24,6 @@ packing.c syntFilter.c ) -SET(CMAKE_VERBOSE_MAKEFILE ON) - ADD_LIBRARY(libilbc STATIC ${ilbc_SRCS}) -SET_TARGET_PROPERTIES(libilbc PROPERTIES OUTPUT_NAME "ilbc") -TARGET_LINK_LIBRARIES(libilbc ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(libilbc ${CMAKE_DL_LIBS}) diff --git a/core/plug-in/l16/CMakeLists.txt b/core/plug-in/l16/CMakeLists.txt index 747adf7b..4e1ed22c 100644 --- a/core/plug-in/l16/CMakeLists.txt +++ b/core/plug-in/l16/CMakeLists.txt @@ -3,6 +3,5 @@ set (l16_SRCS ) ADD_LIBRARY(l16 SHARED ${l16_SRCS}) -SET_TARGET_PROPERTIES(l16 PROPERTIES OUTPUT_NAME "l16") -TARGET_LINK_LIBRARIES(l16 ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(l16 ${CMAKE_DL_LIBS}) diff --git a/core/plug-in/session_timer/CMakeLists.txt b/core/plug-in/session_timer/CMakeLists.txt index 321f68e9..887dd980 100644 --- a/core/plug-in/session_timer/CMakeLists.txt +++ b/core/plug-in/session_timer/CMakeLists.txt @@ -4,6 +4,5 @@ UserTimer.cpp ) ADD_LIBRARY(session_timer SHARED ${session_timer_SRCS}) -SET_TARGET_PROPERTIES(session_timer PROPERTIES OUTPUT_NAME "session_timer") -TARGET_LINK_LIBRARIES(session_timer ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(session_timer ${CMAKE_DL_LIBS}) diff --git a/core/plug-in/sipctrl/CMakeLists.txt b/core/plug-in/sipctrl/CMakeLists.txt index a901d08d..a8dcc2b4 100644 --- a/core/plug-in/sipctrl/CMakeLists.txt +++ b/core/plug-in/sipctrl/CMakeLists.txt @@ -21,8 +21,7 @@ set (sipctrl_SRCS ) ADD_LIBRARY(sipctrl SHARED ${sipctrl_SRCS}) -SET_TARGET_PROPERTIES(sipctrl PROPERTIES OUTPUT_NAME "sipctrl") -TARGET_LINK_LIBRARIES(sipctrl ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(sipctrl ${CMAKE_DL_LIBS}) IF(SEMS_USE_IPV6) ADD_DEFINITIONS(-DSUPPORT_IPV6) diff --git a/core/plug-in/speex/CMakeLists.txt b/core/plug-in/speex/CMakeLists.txt index 4012b705..fc387a19 100644 --- a/core/plug-in/speex/CMakeLists.txt +++ b/core/plug-in/speex/CMakeLists.txt @@ -5,7 +5,7 @@ set (speex_SRCS INCLUDE_DIRECTORIES(${SPEEX_INCLUDE_DIR}) # module_cflags = -ansi # -DNOFPU -ADD_LIBRARY(speex SHARED ${speex_SRCS}) -SET_TARGET_PROPERTIES(speex PROPERTIES OUTPUT_NAME "speex") -TARGET_LINK_LIBRARIES(speex ${CMAKE_DL_LIBS} pthread ${SPEEX_LIBRARIES} m) +ADD_LIBRARY(libspeex SHARED ${speex_SRCS}) +SET_TARGET_PROPERTIES(libspeex PROPERTIES OUTPUT_NAME "speex") +TARGET_LINK_LIBRARIES(libspeex ${CMAKE_DL_LIBS} speex) diff --git a/core/plug-in/stats/CMakeLists.txt b/core/plug-in/stats/CMakeLists.txt index cdab155b..ea06d839 100644 --- a/core/plug-in/stats/CMakeLists.txt +++ b/core/plug-in/stats/CMakeLists.txt @@ -8,11 +8,10 @@ query_stats.cxx ) ADD_EXECUTABLE (sems-stats ${sems_stats_SRCS}) -TARGET_LINK_LIBRARIES(sems-stats ${CMAKE_DL_LIBS} stdc++ m) +TARGET_LINK_LIBRARIES(sems-stats ${CMAKE_DL_LIBS} stdc++) ADD_LIBRARY(stats SHARED ${stats_SRCS}) -SET_TARGET_PROPERTIES(stats PROPERTIES OUTPUT_NAME "stats") -TARGET_LINK_LIBRARIES(stats ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(stats ${CMAKE_DL_LIBS}) INSTALL(TARGETS sems-stats RUNTIME DESTINATION sbin diff --git a/core/plug-in/uac_auth/CMakeLists.txt b/core/plug-in/uac_auth/CMakeLists.txt index 4393a7dc..7600b8fb 100644 --- a/core/plug-in/uac_auth/CMakeLists.txt +++ b/core/plug-in/uac_auth/CMakeLists.txt @@ -4,6 +4,5 @@ UACAuth.cpp ) ADD_LIBRARY(uac_auth SHARED ${uac_auth_SRCS}) -SET_TARGET_PROPERTIES(uac_auth PROPERTIES OUTPUT_NAME "uac_auth") -TARGET_LINK_LIBRARIES(uac_auth ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(uac_auth ${CMAKE_DL_LIBS}) diff --git a/core/plug-in/wav/CMakeLists.txt b/core/plug-in/wav/CMakeLists.txt index 8ad83b52..cc470ca1 100644 --- a/core/plug-in/wav/CMakeLists.txt +++ b/core/plug-in/wav/CMakeLists.txt @@ -5,6 +5,5 @@ set (wav_SRCS ) ADD_LIBRARY(wav SHARED ${wav_SRCS}) -SET_TARGET_PROPERTIES(wav PROPERTIES OUTPUT_NAME "wav") -TARGET_LINK_LIBRARIES(wav ${CMAKE_DL_LIBS} pthread m) +TARGET_LINK_LIBRARIES(wav ${CMAKE_DL_LIBS})