diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a7739fe..5a7274e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,8 +41,6 @@ IF(SEMS_USE_SPANDSP)
 		SET(SPANDSP_FOUND TRUE)
 		MESSAGE(STATUS "Found spandsp includes:	${SPANDSP_INCLUDE_DIR}/spandsp.h")
 		MESSAGE(STATUS "Found spandsp library: ${SPANDSP_LIBRARIES}")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_SPANDSP -D__STDC_LIMIT_MACROS")
-		SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -DUSE_SPANDSP -D__STDC_LIMIT_MACROS")
 		MESSAGE(STATUS "Using spandsp: YES")
 	ELSE(SPANDSP_INCLUDE_DIR AND SPANDSP_LIBRARIES)
 		SET(SPANDSP_FOUND FALSE)
@@ -62,8 +60,6 @@ IF(SEMS_USE_LIBSAMPLERATE)
 		SET(LIBSAMPLERATE_FOUND TRUE)
 		MESSAGE(STATUS "Found libsamplerate includes: ${LIBSAMPLERATE_INCLUDE_DIR}/samplerate.h")
 		MESSAGE(STATUS "Found libsamplerate library: ${LIBSAMPLERATE_LIBRARIES}")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBSAMPLERATE")
-		SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -DUSE_LIBSAMPLERATE")
 		MESSAGE(STATUS "Using libsamplerate: YES")
 	ELSE(LIBSAMPLERATE_INCLUDE_DIR AND LIBSAMPLERATE_LIBRARIES)
 		SET(LIBSAMPLERATE_FOUND FALSE)
diff --git a/apps/ann_b2b/CMakeLists.txt b/apps/ann_b2b/CMakeLists.txt
index 6b42a0e8..c95f4604 100644
--- a/apps/ann_b2b/CMakeLists.txt
+++ b/apps/ann_b2b/CMakeLists.txt
@@ -2,8 +2,8 @@ set (ann_b2b_SRCS
 AnnounceB2B.cpp
 )
 
-add_library(ann_b2b SHARED ${ann_b2b_SRCS})
-set_target_properties(ann_b2b PROPERTIES OUTPUT_NAME "ann_b2b")
-set_target_properties(ann_b2b PROPERTIES PREFIX "")
-target_link_libraries(ann_b2b ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(ann_b2b SHARED ${ann_b2b_SRCS})
+SET_TARGET_PROPERTIES(ann_b2b PROPERTIES OUTPUT_NAME "ann_b2b")
+SET_TARGET_PROPERTIES(ann_b2b PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(ann_b2b ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/announce_transfer/CMakeLists.txt b/apps/announce_transfer/CMakeLists.txt
index be95c81f..537b4577 100644
--- a/apps/announce_transfer/CMakeLists.txt
+++ b/apps/announce_transfer/CMakeLists.txt
@@ -2,8 +2,8 @@ set (announce_transfer_SRCS
 AnnounceTransfer.cpp
 )
 
-add_library(announce_transfer SHARED ${announce_transfer_SRCS})
-set_target_properties(announce_transfer PROPERTIES OUTPUT_NAME "announce_transfer")
-set_target_properties(announce_transfer PROPERTIES PREFIX "")
-target_link_libraries(announce_transfer ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(announce_transfer SHARED ${announce_transfer_SRCS})
+SET_TARGET_PROPERTIES(announce_transfer PROPERTIES OUTPUT_NAME "announce_transfer")
+SET_TARGET_PROPERTIES(announce_transfer PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(announce_transfer ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/announcement/CMakeLists.txt b/apps/announcement/CMakeLists.txt
index f4190971..648456f8 100644
--- a/apps/announcement/CMakeLists.txt
+++ b/apps/announcement/CMakeLists.txt
@@ -2,8 +2,8 @@ set (announcement_SRCS
 Announcement.cpp
 )
 
-add_library(announcement SHARED ${announcement_SRCS})
-set_target_properties(announcement PROPERTIES OUTPUT_NAME "announcement")
-set_target_properties(announcement PROPERTIES PREFIX "")
-target_link_libraries(announcement ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(announcement SHARED ${announcement_SRCS})
+SET_TARGET_PROPERTIES(announcement PROPERTIES OUTPUT_NAME "announcement")
+SET_TARGET_PROPERTIES(announcement PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(announcement ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/annrecorder/CMakeLists.txt b/apps/annrecorder/CMakeLists.txt
index f543a49e..192c36ff 100644
--- a/apps/annrecorder/CMakeLists.txt
+++ b/apps/annrecorder/CMakeLists.txt
@@ -2,8 +2,8 @@ set (annrecorder_SRCS
 AnnRecorder.cpp
 )
 
-add_library(annrecorder SHARED ${annrecorder_SRCS})
-set_target_properties(annrecorder PROPERTIES OUTPUT_NAME "annrecorder")
-set_target_properties(annrecorder PROPERTIES PREFIX "")
-target_link_libraries(annrecorder ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(annrecorder SHARED ${annrecorder_SRCS})
+SET_TARGET_PROPERTIES(annrecorder PROPERTIES OUTPUT_NAME "annrecorder")
+SET_TARGET_PROPERTIES(annrecorder PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(annrecorder ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/auth_b2b/CMakeLists.txt b/apps/auth_b2b/CMakeLists.txt
index 5c29cf03..e0a43b89 100644
--- a/apps/auth_b2b/CMakeLists.txt
+++ b/apps/auth_b2b/CMakeLists.txt
@@ -10,8 +10,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"auth_b2b\"'")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(auth_b2b SHARED ${auth_b2b_SRCS})
-set_target_properties(auth_b2b PROPERTIES OUTPUT_NAME "auth_b2b")
-set_target_properties(auth_b2b PROPERTIES PREFIX "")
-target_link_libraries(auth_b2b ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(auth_b2b SHARED ${auth_b2b_SRCS})
+SET_TARGET_PROPERTIES(auth_b2b PROPERTIES OUTPUT_NAME "auth_b2b")
+SET_TARGET_PROPERTIES(auth_b2b PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(auth_b2b ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/call_timer/CMakeLists.txt b/apps/call_timer/CMakeLists.txt
index 7b4d6930..a1ace9d3 100644
--- a/apps/call_timer/CMakeLists.txt
+++ b/apps/call_timer/CMakeLists.txt
@@ -10,8 +10,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"call_timer\"'")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(call_timer SHARED ${call_timer_SRCS})
-set_target_properties(call_timer PROPERTIES OUTPUT_NAME "call_timer")
-set_target_properties(call_timer PROPERTIES PREFIX "")
-target_link_libraries(call_timer ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(call_timer SHARED ${call_timer_SRCS})
+SET_TARGET_PROPERTIES(call_timer PROPERTIES OUTPUT_NAME "call_timer")
+SET_TARGET_PROPERTIES(call_timer PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(call_timer ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/callback/CMakeLists.txt b/apps/callback/CMakeLists.txt
index 74a2d61c..d4f2736e 100644
--- a/apps/callback/CMakeLists.txt
+++ b/apps/callback/CMakeLists.txt
@@ -10,8 +10,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"callback\"'")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(callback SHARED ${callback_SRCS})
-set_target_properties(callback PROPERTIES OUTPUT_NAME "callback")
-set_target_properties(callback PROPERTIES PREFIX "")
-target_link_libraries(callback ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(callback SHARED ${callback_SRCS})
+SET_TARGET_PROPERTIES(callback PROPERTIES OUTPUT_NAME "callback")
+SET_TARGET_PROPERTIES(callback PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(callback ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/click2dial/CMakeLists.txt b/apps/click2dial/CMakeLists.txt
index 11202b1d..176c518d 100644
--- a/apps/click2dial/CMakeLists.txt
+++ b/apps/click2dial/CMakeLists.txt
@@ -2,8 +2,8 @@ set (click2dial_SRCS
 Click2Dial.cpp
 )
 
-add_library(click2dial SHARED ${click2dial_SRCS})
-set_target_properties(click2dial PROPERTIES OUTPUT_NAME "click2dial")
-set_target_properties(click2dial PROPERTIES PREFIX "")
-target_link_libraries(click2dial ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(click2dial SHARED ${click2dial_SRCS})
+SET_TARGET_PROPERTIES(click2dial PROPERTIES OUTPUT_NAME "click2dial")
+SET_TARGET_PROPERTIES(click2dial PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(click2dial ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt
index be20cf53..db539fb0 100644
--- a/apps/conference/CMakeLists.txt
+++ b/apps/conference/CMakeLists.txt
@@ -2,29 +2,29 @@ set (conference_SRCS
 Conference.cpp
 )
 
-add_library(conference SHARED ${conference_SRCS})
-set_target_properties(conference PROPERTIES OUTPUT_NAME "conference")
-set_target_properties(conference PROPERTIES PREFIX "")
-target_link_libraries(conference ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(conference SHARED ${conference_SRCS})
+SET_TARGET_PROPERTIES(conference PROPERTIES OUTPUT_NAME "conference")
+SET_TARGET_PROPERTIES(conference PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} pthread m)
 
 IF(FLITE_FOUND AND ZRTP_FOUND)
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_SAS_TTS -I${FLITE_INCLUDE_DIR}/flite")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_SAS_TTS -I${FLITE_INCLUDE_DIR}/flite")
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_SAS_TTS -I${FLITE_INCLUDE_DIR}/flite")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-SET_TARGET_PROPERTIES(conference PROPERTIES LINK_FLAGS "${LINK_FLAGS} -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite")
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_SAS_TTS -I${FLITE_INCLUDE_DIR}/flite")
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} flite_cmu_us_kal flite_usenglish flite_cmulex flite)
 ENDIF(FLITE_FOUND AND ZRTP_FOUND)
 
 IF(MYSQLPP_FOUND)
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MYSQL -I${MYSQLPP_INCLUDE_DIR}/mysql++ -I/usr/include/mysql")
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-SET_TARGET_PROPERTIES(conference PROPERTIES LINK_FLAGS "${LINK_FLAGS} -lmysqlpp")
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MYSQL -I${MYSQLPP_INCLUDE_DIR}/mysql++ -I/usr/include/mysql")
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} mysqlpp)
 ENDIF(MYSQLPP_FOUND)
diff --git a/apps/diameter_client/CMakeLists.txt b/apps/diameter_client/CMakeLists.txt
index 617fd560..a6d8e812 100644
--- a/apps/diameter_client/CMakeLists.txt
+++ b/apps/diameter_client/CMakeLists.txt
@@ -6,20 +6,20 @@ ServerConnection.cpp
 ADD_SUBDIRECTORY (lib_dbase)
 INCLUDE_DIRECTORIES (lib_dbase)
 
-set_property(TARGET libdbase PROPERTY IMPORTED_LOCATION ./lib_dbase/libdbase.a)
+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")
-set_target_properties(diameter_client PROPERTIES PREFIX "")
-target_link_libraries(diameter_client ${CMAKE_DL_LIBS} pthread m libdbase)
+ADD_LIBRARY(diameter_client SHARED ${diameter_client_SRCS})
+SET_TARGET_PROPERTIES(diameter_client PROPERTIES OUTPUT_NAME "diameter_client")
+SET_TARGET_PROPERTIES(diameter_client PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(diameter_client ${CMAKE_DL_LIBS} pthread m libdbase)
 
 IF(OPENSSL_FOUND)
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_OPENSSL")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_OPENSSL")
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_OPENSSL")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-SET_TARGET_PROPERTIES(diameter_client PROPERTIES LINK_FLAGS "${LINK_FLAGS} -lssl -lcrypto")
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_OPENSSL")
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	TARGET_LINK_LIBRARIES(diameter_client ${CMAKE_DL_LIBS} ssl crypto)
 ENDIF(OPENSSL_FOUND)
diff --git a/apps/dsm/CMakeLists.txt b/apps/dsm/CMakeLists.txt
index 75cb4eca..0d104320 100644
--- a/apps/dsm/CMakeLists.txt
+++ b/apps/dsm/CMakeLists.txt
@@ -14,8 +14,8 @@ INCLUDE_DIRECTORIES (.)
 
 ADD_SUBDIRECTORY (mods)
 
-add_library(dsm SHARED ${dsm_SRCS})
-set_target_properties(dsm PROPERTIES OUTPUT_NAME "dsm")
-set_target_properties(dsm PROPERTIES PREFIX "")
-target_link_libraries(dsm ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(dsm SHARED ${dsm_SRCS})
+SET_TARGET_PROPERTIES(dsm PROPERTIES OUTPUT_NAME "dsm")
+SET_TARGET_PROPERTIES(dsm PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(dsm ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/dsm/mods/CMakeLists.txt b/apps/dsm/mods/CMakeLists.txt
index e4bed3b3..f5e254aa 100644
--- a/apps/dsm/mods/CMakeLists.txt
+++ b/apps/dsm/mods/CMakeLists.txt
@@ -6,6 +6,7 @@ ENDIF(SEMS_USE_MONITORING)
 IF(MYSQLPP_FOUND)
 	ADD_SUBDIRECTORY (mod_mysql)
 ENDIF(MYSQLPP_FOUND)
+#ADD_SUBDIRECTORY (mod_py)
 ADD_SUBDIRECTORY (mod_sys)
 ADD_SUBDIRECTORY (mod_uri)
 ADD_SUBDIRECTORY (mod_utils)
diff --git a/apps/dsm/mods/mod_conference/CMakeLists.txt b/apps/dsm/mods/mod_conference/CMakeLists.txt
index 74edc28e..d8d0652c 100644
--- a/apps/dsm/mods/mod_conference/CMakeLists.txt
+++ b/apps/dsm/mods/mod_conference/CMakeLists.txt
@@ -2,8 +2,8 @@ set (mod_conference_SRCS
 ModConference.cpp
 )
 
-add_library(mod_conference SHARED ${mod_conference_SRCS})
-set_target_properties(mod_conference PROPERTIES OUTPUT_NAME "mod_conference")
-set_target_properties(mod_conference PROPERTIES PREFIX "")
-target_link_libraries(mod_conference ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(mod_conference SHARED ${mod_conference_SRCS})
+SET_TARGET_PROPERTIES(mod_conference PROPERTIES OUTPUT_NAME "mod_conference")
+SET_TARGET_PROPERTIES(mod_conference PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(mod_conference ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/dsm/mods/mod_dlg/CMakeLists.txt b/apps/dsm/mods/mod_dlg/CMakeLists.txt
index 2308d187..3279c820 100644
--- a/apps/dsm/mods/mod_dlg/CMakeLists.txt
+++ b/apps/dsm/mods/mod_dlg/CMakeLists.txt
@@ -2,8 +2,8 @@ set (mod_dlg_SRCS
 ModDlg.cpp
 )
 
-add_library(mod_dlg SHARED ${mod_dlg_SRCS})
-set_target_properties(mod_dlg PROPERTIES OUTPUT_NAME "mod_dlg")
-set_target_properties(mod_dlg PROPERTIES PREFIX "")
-target_link_libraries(mod_dlg ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(mod_dlg SHARED ${mod_dlg_SRCS})
+SET_TARGET_PROPERTIES(mod_dlg PROPERTIES OUTPUT_NAME "mod_dlg")
+SET_TARGET_PROPERTIES(mod_dlg PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(mod_dlg ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/dsm/mods/mod_monitoring/CMakeLists.txt b/apps/dsm/mods/mod_monitoring/CMakeLists.txt
index de095ba2..53e3c9df 100644
--- a/apps/dsm/mods/mod_monitoring/CMakeLists.txt
+++ b/apps/dsm/mods/mod_monitoring/CMakeLists.txt
@@ -2,8 +2,8 @@ set (mod_monitoring_SRCS
 ModMonitoring.cpp
 )
 
-add_library(mod_monitoring SHARED ${mod_monitoring_SRCS})
-set_target_properties(mod_monitoring PROPERTIES OUTPUT_NAME "mod_monitoring")
-set_target_properties(mod_monitoring PROPERTIES PREFIX "")
-target_link_libraries(mod_monitoring ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(mod_monitoring SHARED ${mod_monitoring_SRCS})
+SET_TARGET_PROPERTIES(mod_monitoring PROPERTIES OUTPUT_NAME "mod_monitoring")
+SET_TARGET_PROPERTIES(mod_monitoring PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(mod_monitoring ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/dsm/mods/mod_mysql/CMakeLists.txt b/apps/dsm/mods/mod_mysql/CMakeLists.txt
index e7dc1d70..d5f96dc5 100644
--- a/apps/dsm/mods/mod_mysql/CMakeLists.txt
+++ b/apps/dsm/mods/mod_mysql/CMakeLists.txt
@@ -10,8 +10,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/mysql++ -I/usr/include/mysql")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(mod_mysql SHARED ${mod_mysql_SRCS})
-set_target_properties(mod_mysql PROPERTIES OUTPUT_NAME "mod_mysql")
-set_target_properties(mod_mysql PROPERTIES PREFIX "")
-target_link_libraries(mod_mysql ${CMAKE_DL_LIBS} pthread m mysqlpp)
+ADD_LIBRARY(mod_mysql SHARED ${mod_mysql_SRCS})
+SET_TARGET_PROPERTIES(mod_mysql PROPERTIES OUTPUT_NAME "mod_mysql")
+SET_TARGET_PROPERTIES(mod_mysql PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(mod_mysql ${CMAKE_DL_LIBS} pthread m mysqlpp)
 
diff --git a/apps/dsm/mods/mod_sys/CMakeLists.txt b/apps/dsm/mods/mod_sys/CMakeLists.txt
index 37591d47..653dce5e 100644
--- a/apps/dsm/mods/mod_sys/CMakeLists.txt
+++ b/apps/dsm/mods/mod_sys/CMakeLists.txt
@@ -2,8 +2,8 @@ set (mod_sys_SRCS
 ModSys.cpp
 )
 
-add_library(mod_sys SHARED ${mod_sys_SRCS})
-set_target_properties(mod_sys PROPERTIES OUTPUT_NAME "mod_sys")
-set_target_properties(mod_sys PROPERTIES PREFIX "")
-target_link_libraries(mod_sys ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(mod_sys SHARED ${mod_sys_SRCS})
+SET_TARGET_PROPERTIES(mod_sys PROPERTIES OUTPUT_NAME "mod_sys")
+SET_TARGET_PROPERTIES(mod_sys PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(mod_sys ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/dsm/mods/mod_uri/CMakeLists.txt b/apps/dsm/mods/mod_uri/CMakeLists.txt
index 2b759d63..b67d7197 100644
--- a/apps/dsm/mods/mod_uri/CMakeLists.txt
+++ b/apps/dsm/mods/mod_uri/CMakeLists.txt
@@ -2,8 +2,8 @@ set (mod_uri_SRCS
 ModUri.cpp
 )
 
-add_library(mod_uri SHARED ${mod_uri_SRCS})
-set_target_properties(mod_uri PROPERTIES OUTPUT_NAME "mod_uri")
-set_target_properties(mod_uri PROPERTIES PREFIX "")
-target_link_libraries(mod_uri ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(mod_uri SHARED ${mod_uri_SRCS})
+SET_TARGET_PROPERTIES(mod_uri PROPERTIES OUTPUT_NAME "mod_uri")
+SET_TARGET_PROPERTIES(mod_uri PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(mod_uri ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/dsm/mods/mod_utils/CMakeLists.txt b/apps/dsm/mods/mod_utils/CMakeLists.txt
index 71900bfa..2d9184c1 100644
--- a/apps/dsm/mods/mod_utils/CMakeLists.txt
+++ b/apps/dsm/mods/mod_utils/CMakeLists.txt
@@ -2,8 +2,8 @@ set (mod_utils_SRCS
 ModUtils.cpp
 )
 
-add_library(mod_utils SHARED ${mod_utils_SRCS})
-set_target_properties(mod_utils PROPERTIES OUTPUT_NAME "mod_utils")
-set_target_properties(mod_utils PROPERTIES PREFIX "")
-target_link_libraries(mod_utils ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(mod_utils SHARED ${mod_utils_SRCS})
+SET_TARGET_PROPERTIES(mod_utils PROPERTIES OUTPUT_NAME "mod_utils")
+SET_TARGET_PROPERTIES(mod_utils PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(mod_utils ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/early_announce/CMakeLists.txt b/apps/early_announce/CMakeLists.txt
index 85b6743f..ce70be70 100644
--- a/apps/early_announce/CMakeLists.txt
+++ b/apps/early_announce/CMakeLists.txt
@@ -2,18 +2,18 @@ set (early_announce_SRCS
 EarlyAnnounce.cpp
 )
 
-add_library(early_announce SHARED ${early_announce_SRCS})
-set_target_properties(early_announce PROPERTIES OUTPUT_NAME "early_announce")
-set_target_properties(early_announce PROPERTIES PREFIX "")
-target_link_libraries(early_announce ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(early_announce SHARED ${early_announce_SRCS})
+SET_TARGET_PROPERTIES(early_announce PROPERTIES OUTPUT_NAME "early_announce")
+SET_TARGET_PROPERTIES(early_announce PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(early_announce ${CMAKE_DL_LIBS} pthread m)
 
 IF(MYSQLPP_FOUND)
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-SET_TARGET_PROPERTIES(early_announce PROPERTIES LINK_FLAGS "${LINK_FLAGS} -lmysqlpp")
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	TARGET_LINK_LIBRARIES(early_announce ${CMAKE_DL_LIBS} mysqlpp)
 ENDIF(MYSQLPP_FOUND)
diff --git a/apps/gateway/CMakeLists.txt b/apps/gateway/CMakeLists.txt
index fd18b780..0c1224d7 100644
--- a/apps/gateway/CMakeLists.txt
+++ b/apps/gateway/CMakeLists.txt
@@ -14,8 +14,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGW_VERSION='\"0.1\"'")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(gateway SHARED ${gateway_SRCS})
-set_target_properties(gateway PROPERTIES OUTPUT_NAME "gateway")
-set_target_properties(gateway PROPERTIES PREFIX "")
-target_link_libraries(gateway ${CMAKE_DL_LIBS} pthread m mISDN isdnnet)
+ADD_LIBRARY(gateway SHARED ${gateway_SRCS})
+SET_TARGET_PROPERTIES(gateway PROPERTIES OUTPUT_NAME "gateway")
+SET_TARGET_PROPERTIES(gateway PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(gateway ${CMAKE_DL_LIBS} pthread m mISDN isdnnet)
 
diff --git a/apps/ivr/CMakeLists.txt b/apps/ivr/CMakeLists.txt
index 8cf03fa9..829ad87e 100644
--- a/apps/ivr/CMakeLists.txt
+++ b/apps/ivr/CMakeLists.txt
@@ -17,19 +17,19 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${PYTHON_INCLUDE_PATH}")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(ivr SHARED ${ivr_SRCS})
-set_target_properties(ivr PROPERTIES OUTPUT_NAME "ivr")
-set_target_properties(ivr PROPERTIES PREFIX "")
-target_link_libraries(ivr ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(ivr SHARED ${ivr_SRCS})
+SET_TARGET_PROPERTIES(ivr PROPERTIES OUTPUT_NAME "ivr")
+SET_TARGET_PROPERTIES(ivr PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(ivr ${CMAKE_DL_LIBS} pthread m)
 
 IF(FLITE_FOUND)
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DIVR_WITH_TTS -I${FLITE_INCLUDE_DIR}/flite")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DIVR_WITH_TTS -I${FLITE_INCLUDE_DIR}/flite")
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIVR_WITH_TTS -I${FLITE_INCLUDE_DIR}/flite")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-SET_TARGET_PROPERTIES(ivr PROPERTIES LINK_FLAGS "${LINK_FLAGS} -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite")
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIVR_WITH_TTS -I${FLITE_INCLUDE_DIR}/flite")
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	TARGET_LINK_LIBRARIES(ivr ${CMAKE_DL_LIBS} flite_cmu_us_kal flite_usenglish flite_cmulex flite)
 ENDIF(FLITE_FOUND)
 
diff --git a/apps/monitoring/CMakeLists.txt b/apps/monitoring/CMakeLists.txt
index dc0c6d1a..66580f97 100644
--- a/apps/monitoring/CMakeLists.txt
+++ b/apps/monitoring/CMakeLists.txt
@@ -10,8 +10,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"monitoring\"'")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(monitoring SHARED ${monitoring_SRCS})
-set_target_properties(monitoring PROPERTIES OUTPUT_NAME "monitoring")
-set_target_properties(monitoring PROPERTIES PREFIX "")
-target_link_libraries(monitoring ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(monitoring SHARED ${monitoring_SRCS})
+SET_TARGET_PROPERTIES(monitoring PROPERTIES OUTPUT_NAME "monitoring")
+SET_TARGET_PROPERTIES(monitoring PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(monitoring ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/mp3/CMakeLists.txt b/apps/mp3/CMakeLists.txt
index 6c0bf054..69136ec9 100644
--- a/apps/mp3/CMakeLists.txt
+++ b/apps/mp3/CMakeLists.txt
@@ -6,8 +6,8 @@ mp3.c
 #	module_ldflags += -lmpg123
 #	module_cflags += -DWITH_MPG123DECODER
 
-add_library(mp3 SHARED ${mp3_SRCS})
-set_target_properties(mp3 PROPERTIES OUTPUT_NAME "mp3")
-set_target_properties(mp3 PROPERTIES PREFIX "")
-target_link_libraries(mp3 ${CMAKE_DL_LIBS} pthread m mp3lame)
+ADD_LIBRARY(mp3 SHARED ${mp3_SRCS})
+SET_TARGET_PROPERTIES(mp3 PROPERTIES OUTPUT_NAME "mp3")
+SET_TARGET_PROPERTIES(mp3 PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(mp3 ${CMAKE_DL_LIBS} pthread m mp3lame)
 
diff --git a/apps/msg_storage/CMakeLists.txt b/apps/msg_storage/CMakeLists.txt
index a54b01c0..119d3df6 100644
--- a/apps/msg_storage/CMakeLists.txt
+++ b/apps/msg_storage/CMakeLists.txt
@@ -14,8 +14,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"msg_storage\"'")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(msg_storage SHARED ${msg_storage_SRCS})
-set_target_properties(msg_storage PROPERTIES OUTPUT_NAME "msg_storage")
-set_target_properties(msg_storage PROPERTIES PREFIX "")
-target_link_libraries(msg_storage ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(msg_storage SHARED ${msg_storage_SRCS})
+SET_TARGET_PROPERTIES(msg_storage PROPERTIES OUTPUT_NAME "msg_storage")
+SET_TARGET_PROPERTIES(msg_storage PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(msg_storage ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/precoded_announce/CMakeLists.txt b/apps/precoded_announce/CMakeLists.txt
index 2e9dc57c..4d2369d3 100644
--- a/apps/precoded_announce/CMakeLists.txt
+++ b/apps/precoded_announce/CMakeLists.txt
@@ -10,8 +10,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"precoded_announce\"'")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(precoded_announce SHARED ${precoded_announce_SRCS})
-set_target_properties(precoded_announce PROPERTIES OUTPUT_NAME "precoded_announce")
-set_target_properties(precoded_announce PROPERTIES PREFIX "")
-target_link_libraries(precoded_announce ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(precoded_announce SHARED ${precoded_announce_SRCS})
+SET_TARGET_PROPERTIES(precoded_announce PROPERTIES OUTPUT_NAME "precoded_announce")
+SET_TARGET_PROPERTIES(precoded_announce PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(precoded_announce ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/reg_agent/CMakeLists.txt b/apps/reg_agent/CMakeLists.txt
index 3bbe7f33..1998547d 100644
--- a/apps/reg_agent/CMakeLists.txt
+++ b/apps/reg_agent/CMakeLists.txt
@@ -2,8 +2,8 @@ set (reg_agent_SRCS
 RegistrationAgent.cpp
 )
 
-add_library(reg_agent SHARED ${reg_agent_SRCS})
-set_target_properties(reg_agent PROPERTIES OUTPUT_NAME "reg_agent")
-set_target_properties(reg_agent PROPERTIES PREFIX "")
-target_link_libraries(reg_agent ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(reg_agent SHARED ${reg_agent_SRCS})
+SET_TARGET_PROPERTIES(reg_agent PROPERTIES OUTPUT_NAME "reg_agent")
+SET_TARGET_PROPERTIES(reg_agent PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(reg_agent ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/registrar_client/CMakeLists.txt b/apps/registrar_client/CMakeLists.txt
index e567dde6..048a6bd8 100644
--- a/apps/registrar_client/CMakeLists.txt
+++ b/apps/registrar_client/CMakeLists.txt
@@ -3,8 +3,8 @@ ContactInfo.cpp
 SIPRegistrarClient.cpp
 )
 
-add_library(registrar_client SHARED ${registrar_client_SRCS})
-set_target_properties(registrar_client PROPERTIES OUTPUT_NAME "registrar_client")
-set_target_properties(registrar_client PROPERTIES PREFIX "")
-target_link_libraries(registrar_client ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(registrar_client SHARED ${registrar_client_SRCS})
+SET_TARGET_PROPERTIES(registrar_client PROPERTIES OUTPUT_NAME "registrar_client")
+SET_TARGET_PROPERTIES(registrar_client PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(registrar_client ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/sw_prepaid_sip/CMakeLists.txt b/apps/sw_prepaid_sip/CMakeLists.txt
index eb01b996..3e3889b3 100644
--- a/apps/sw_prepaid_sip/CMakeLists.txt
+++ b/apps/sw_prepaid_sip/CMakeLists.txt
@@ -2,8 +2,8 @@ set (sw_prepaid_sip_SRCS
 SWPrepaidSIP.cpp
 )
 
-add_library(sw_prepaid_sip SHARED ${sw_prepaid_sip_SRCS})
-set_target_properties(sw_prepaid_sip PROPERTIES OUTPUT_NAME "sw_prepaid_sip")
-set_target_properties(sw_prepaid_sip PROPERTIES PREFIX "")
-target_link_libraries(sw_prepaid_sip ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(sw_prepaid_sip SHARED ${sw_prepaid_sip_SRCS})
+SET_TARGET_PROPERTIES(sw_prepaid_sip PROPERTIES OUTPUT_NAME "sw_prepaid_sip")
+SET_TARGET_PROPERTIES(sw_prepaid_sip PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(sw_prepaid_sip ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/voicebox/CMakeLists.txt b/apps/voicebox/CMakeLists.txt
index 0b0ef83d..a5229473 100644
--- a/apps/voicebox/CMakeLists.txt
+++ b/apps/voicebox/CMakeLists.txt
@@ -3,8 +3,8 @@ Voicebox.cpp
 VoiceboxDialog.cpp
 )
 
-add_library(voicebox SHARED ${voicebox_SRCS})
-set_target_properties(voicebox PROPERTIES OUTPUT_NAME "voicebox")
-set_target_properties(voicebox PROPERTIES PREFIX "")
-target_link_libraries(voicebox ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(voicebox SHARED ${voicebox_SRCS})
+SET_TARGET_PROPERTIES(voicebox PROPERTIES OUTPUT_NAME "voicebox")
+SET_TARGET_PROPERTIES(voicebox PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(voicebox ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/voicemail/CMakeLists.txt b/apps/voicemail/CMakeLists.txt
index 9ff186af..ff6d49a9 100644
--- a/apps/voicemail/CMakeLists.txt
+++ b/apps/voicemail/CMakeLists.txt
@@ -5,18 +5,18 @@ AnswerMachine.cpp
 EmailTemplate.cpp
 )
 
-add_library(voicemail SHARED ${voicemail_SRCS})
-set_target_properties(voicemail PROPERTIES OUTPUT_NAME "voicemail")
-set_target_properties(voicemail PROPERTIES PREFIX "")
-target_link_libraries(voicemail ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(voicemail SHARED ${voicemail_SRCS})
+SET_TARGET_PROPERTIES(voicemail PROPERTIES OUTPUT_NAME "voicemail")
+SET_TARGET_PROPERTIES(voicemail PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(voicemail ${CMAKE_DL_LIBS} pthread m)
 
 # Currently cannot be build with mysql++
 #IF(MYSQLPP_FOUND)
-#IF(CMAKE_COMPILER_IS_GNUCC)
-#	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
-#ENDIF(CMAKE_COMPILER_IS_GNUCC)
-#IF(CMAKE_COMPILER_IS_GNUCXX)
-#	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
-#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-#SET_TARGET_PROPERTIES(voicemail PROPERTIES LINK_FLAGS "${LINK_FLAGS} -lmysqlpp")
+#	IF(CMAKE_COMPILER_IS_GNUCC)
+#		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
+#	ENDIF(CMAKE_COMPILER_IS_GNUCC)
+#	IF(CMAKE_COMPILER_IS_GNUCXX)
+#		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
+#	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+#	TARGET_LINK_LIBRARIES(voicemail ${CMAKE_DL_LIBS} mysqlpp)
 #ENDIF(MYSQLPP_FOUND)
diff --git a/apps/webconference/CMakeLists.txt b/apps/webconference/CMakeLists.txt
index d7e04b0e..9232d263 100644
--- a/apps/webconference/CMakeLists.txt
+++ b/apps/webconference/CMakeLists.txt
@@ -5,8 +5,8 @@ WebConference.cpp
 WebConferenceDialog.cpp
 )
 
-add_library(webconference SHARED ${webconference_SRCS})
-set_target_properties(webconference PROPERTIES OUTPUT_NAME "webconference")
-set_target_properties(webconference PROPERTIES PREFIX "")
-target_link_libraries(webconference ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(webconference SHARED ${webconference_SRCS})
+SET_TARGET_PROPERTIES(webconference PROPERTIES OUTPUT_NAME "webconference")
+SET_TARGET_PROPERTIES(webconference PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(webconference ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/apps/xmlrpc2di/CMakeLists.txt b/apps/xmlrpc2di/CMakeLists.txt
index 8a4e2f9a..c7fa74bc 100644
--- a/apps/xmlrpc2di/CMakeLists.txt
+++ b/apps/xmlrpc2di/CMakeLists.txt
@@ -8,20 +8,20 @@ ADD_SUBDIRECTORY (xmlrpc++)
 
 INCLUDE_DIRECTORIES (xmlrpc++/src)
 
-set_property(TARGET xmlrpcpp PROPERTY IMPORTED_LOCATION ./xmlrpc++/src/xmlrpcpp.a)
+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")
-set_target_properties(xmlrpc2di PROPERTIES PREFIX "")
-target_link_libraries(xmlrpc2di ${CMAKE_DL_LIBS} pthread m xmlrpcpp)
+ADD_LIBRARY(xmlrpc2di SHARED ${xmlrpc2di_SRCS})
+SET_TARGET_PROPERTIES(xmlrpc2di PROPERTIES OUTPUT_NAME "xmlrpc2di")
+SET_TARGET_PROPERTIES(xmlrpc2di PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(xmlrpc2di ${CMAKE_DL_LIBS} pthread m xmlrpcpp)
 
 IF(OPENSSL_FOUND)
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS")
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-SET_TARGET_PROPERTIES(xmlrpc2di PROPERTIES LINK_FLAGS "${LINK_FLAGS} -lssl")
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS")
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	TARGET_LINK_LIBRARIES(xmlrpc2di ${CMAKE_DL_LIBS} ssl)
 ENDIF(OPENSSL_FOUND)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 902172dc..212d4f6d 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -55,4 +55,27 @@ INCLUDE_DIRECTORIES (amci)
 ADD_EXECUTABLE (sems ${sems_SRCS})
 TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} pthread stdc++ m)
 
+IF(SPANDSP_FOUND)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_SPANDSP -D__STDC_LIMIT_MACROS")
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_SPANDSP -D__STDC_LIMIT_MACROS")
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} spandsp)
+ENDIF(SPANDSP_FOUND)
+
+IF(LIBSAMPLERATE_FOUND)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBSAMPLERATE")
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBSAMPLERATE")
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} samplerate)
+ENDIF(LIBSAMPLERATE_FOUND)
+
 ADD_SUBDIRECTORY(plug-in)
+
diff --git a/core/plug-in/adpcm/CMakeLists.txt b/core/plug-in/adpcm/CMakeLists.txt
index 1ed7f101..58195b4a 100644
--- a/core/plug-in/adpcm/CMakeLists.txt
+++ b/core/plug-in/adpcm/CMakeLists.txt
@@ -7,8 +7,8 @@ g723_40.c
 g72x.c
 )
 
-add_library(adpcm SHARED ${adpcm_SRCS})
-set_target_properties(adpcm PROPERTIES OUTPUT_NAME "adpcm")
-set_target_properties(adpcm PROPERTIES PREFIX "")
-target_link_libraries(adpcm ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(adpcm SHARED ${adpcm_SRCS})
+SET_TARGET_PROPERTIES(adpcm PROPERTIES OUTPUT_NAME "adpcm")
+SET_TARGET_PROPERTIES(adpcm PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(adpcm ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/core/plug-in/binrpcctrl/CMakeLists.txt b/core/plug-in/binrpcctrl/CMakeLists.txt
index 05d3620a..0f8c004b 100644
--- a/core/plug-in/binrpcctrl/CMakeLists.txt
+++ b/core/plug-in/binrpcctrl/CMakeLists.txt
@@ -8,12 +8,12 @@ ADD_SUBDIRECTORY (libbinrpc)
 
 INCLUDE_DIRECTORIES (libbinrpc/include)
 
-set_property(TARGET libbinrpc PROPERTY IMPORTED_LOCATION ./libbinrpc/src/binrpcctrl.a)
+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")
-set_target_properties(binrpcctrl PROPERTIES PREFIX "")
-target_link_libraries(binrpcctrl ${CMAKE_DL_LIBS} pthread m libbinrpc)
+ADD_LIBRARY(binrpcctrl SHARED ${binrpcctrl_SRCS})
+SET_TARGET_PROPERTIES(binrpcctrl PROPERTIES OUTPUT_NAME "binrpcctrl")
+SET_TARGET_PROPERTIES(binrpcctrl PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(binrpcctrl ${CMAKE_DL_LIBS} pthread m libbinrpc)
 
 
 
diff --git a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
index a64bc357..f4c54432 100644
--- a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
+++ b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
@@ -40,8 +40,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINRPC_LIB_VER=\"1.0-1\" -D_LIBBINRPC_BUILD -DNDEBUG")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-add_library(libbinrpc STATIC ${libbinrpc_SRCS})
-set_target_properties(libbinrpc PROPERTIES OUTPUT_NAME "libbinrpc")
-set_target_properties(libbinrpc PROPERTIES PREFIX "")
-target_link_libraries(libbinrpc ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(libbinrpc STATIC ${libbinrpc_SRCS})
+SET_TARGET_PROPERTIES(libbinrpc PROPERTIES OUTPUT_NAME "libbinrpc")
+SET_TARGET_PROPERTIES(libbinrpc PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(libbinrpc ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/core/plug-in/echo/CMakeLists.txt b/core/plug-in/echo/CMakeLists.txt
index 674aa61d..5ea2686d 100644
--- a/core/plug-in/echo/CMakeLists.txt
+++ b/core/plug-in/echo/CMakeLists.txt
@@ -3,8 +3,8 @@ AmAudioEcho.cpp
 Echo.cpp
 )
 
-add_library(echo SHARED ${echo_SRCS})
-set_target_properties(echo PROPERTIES OUTPUT_NAME "echo")
-set_target_properties(echo PROPERTIES PREFIX "")
-target_link_libraries(echo ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(echo SHARED ${echo_SRCS})
+SET_TARGET_PROPERTIES(echo PROPERTIES OUTPUT_NAME "echo")
+SET_TARGET_PROPERTIES(echo PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(echo ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/core/plug-in/g722/CMakeLists.txt b/core/plug-in/g722/CMakeLists.txt
index f598b2db..14226b49 100644
--- a/core/plug-in/g722/CMakeLists.txt
+++ b/core/plug-in/g722/CMakeLists.txt
@@ -3,8 +3,8 @@ g722.c
 )
 
 #module_cflags  = -ansi # -DNOFPU
-add_library(g722 SHARED ${g722_SRCS})
-set_target_properties(g722 PROPERTIES OUTPUT_NAME "g722")
-set_target_properties(g722 PROPERTIES PREFIX "")
-target_link_libraries(g722 ${CMAKE_DL_LIBS} pthread ${SPANDSP_LIBRARIES} m)
+ADD_LIBRARY(g722 SHARED ${g722_SRCS})
+SET_TARGET_PROPERTIES(g722 PROPERTIES OUTPUT_NAME "g722")
+SET_TARGET_PROPERTIES(g722 PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(g722 ${CMAKE_DL_LIBS} pthread ${SPANDSP_LIBRARIES} m)
 
diff --git a/core/plug-in/gsm/CMakeLists.txt b/core/plug-in/gsm/CMakeLists.txt
index 48e93d0c..efc7131a 100644
--- a/core/plug-in/gsm/CMakeLists.txt
+++ b/core/plug-in/gsm/CMakeLists.txt
@@ -2,8 +2,8 @@ set (gsm_SRCS
  gsm.c
 )
 
-add_library(gsm SHARED ${gsm_SRCS})
-set_target_properties(gsm PROPERTIES OUTPUT_NAME "gsm")
-set_target_properties(gsm PROPERTIES PREFIX "")
-target_link_libraries(gsm ${CMAKE_DL_LIBS} pthread ${GSM_LIBRARIES} m)
+ADD_LIBRARY(gsm SHARED ${gsm_SRCS})
+SET_TARGET_PROPERTIES(gsm PROPERTIES OUTPUT_NAME "gsm")
+SET_TARGET_PROPERTIES(gsm PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(gsm ${CMAKE_DL_LIBS} pthread ${GSM_LIBRARIES} m)
 
diff --git a/core/plug-in/ilbc/CMakeLists.txt b/core/plug-in/ilbc/CMakeLists.txt
index 41166048..c8845b91 100644
--- a/core/plug-in/ilbc/CMakeLists.txt
+++ b/core/plug-in/ilbc/CMakeLists.txt
@@ -6,10 +6,10 @@ ADD_SUBDIRECTORY (iLBC_rfc3951)
 
 INCLUDE_DIRECTORIES (iLBC_rfc3951)
 
-set_property(TARGET libilbc PROPERTY IMPORTED_LOCATION ./iLBC_rfc3951/ilbc.a)
+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")
-set_target_properties(ilbc PROPERTIES PREFIX "")
-target_link_libraries(ilbc ${CMAKE_DL_LIBS} pthread m libilbc)
+ADD_LIBRARY(ilbc SHARED ${ilbc_SRCS})
+SET_TARGET_PROPERTIES(ilbc PROPERTIES OUTPUT_NAME "ilbc")
+SET_TARGET_PROPERTIES(ilbc PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(ilbc ${CMAKE_DL_LIBS} pthread m libilbc)
 
diff --git a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt
index c5cd754b..bd36eceb 100644
--- a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt
+++ b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt
@@ -26,8 +26,8 @@ syntFilter.c
 
 SET(CMAKE_VERBOSE_MAKEFILE ON)
 
-add_library(libilbc STATIC ${ilbc_SRCS})
-set_target_properties(libilbc PROPERTIES OUTPUT_NAME "ilbc")
-set_target_properties(libilbc PROPERTIES PREFIX "")
-target_link_libraries(libilbc ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(libilbc STATIC ${ilbc_SRCS})
+SET_TARGET_PROPERTIES(libilbc PROPERTIES OUTPUT_NAME "ilbc")
+SET_TARGET_PROPERTIES(libilbc PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(libilbc ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/core/plug-in/l16/CMakeLists.txt b/core/plug-in/l16/CMakeLists.txt
index d254dfaf..cb1e8fde 100644
--- a/core/plug-in/l16/CMakeLists.txt
+++ b/core/plug-in/l16/CMakeLists.txt
@@ -2,8 +2,8 @@ set (l16_SRCS
  l16.c
 )
 
-add_library(l16 SHARED ${l16_SRCS})
-set_target_properties(l16 PROPERTIES OUTPUT_NAME "l16")
-set_target_properties(l16 PROPERTIES PREFIX "")
-target_link_libraries(l16 ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(l16 SHARED ${l16_SRCS})
+SET_TARGET_PROPERTIES(l16 PROPERTIES OUTPUT_NAME "l16")
+SET_TARGET_PROPERTIES(l16 PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(l16 ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/core/plug-in/session_timer/CMakeLists.txt b/core/plug-in/session_timer/CMakeLists.txt
index b9abf6a4..4e9e1a64 100644
--- a/core/plug-in/session_timer/CMakeLists.txt
+++ b/core/plug-in/session_timer/CMakeLists.txt
@@ -3,8 +3,8 @@ SessionTimer.cpp
 UserTimer.cpp
 )
 
-add_library(session_timer SHARED ${session_timer_SRCS})
-set_target_properties(session_timer PROPERTIES OUTPUT_NAME "session_timer")
-set_target_properties(session_timer PROPERTIES PREFIX "")
-target_link_libraries(session_timer ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(session_timer SHARED ${session_timer_SRCS})
+SET_TARGET_PROPERTIES(session_timer PROPERTIES OUTPUT_NAME "session_timer")
+SET_TARGET_PROPERTIES(session_timer PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(session_timer ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/core/plug-in/sipctrl/CMakeLists.txt b/core/plug-in/sipctrl/CMakeLists.txt
index d37ddd6b..881f96d9 100644
--- a/core/plug-in/sipctrl/CMakeLists.txt
+++ b/core/plug-in/sipctrl/CMakeLists.txt
@@ -20,6 +20,7 @@ set (sipctrl_SRCS
   wheeltimer.cpp
 )
 
-add_library(sipctrl SHARED ${sipctrl_SRCS})
-set_target_properties(sipctrl PROPERTIES PREFIX "")
-target_link_libraries(sipctrl ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(sipctrl SHARED ${sipctrl_SRCS})
+SET_TARGET_PROPERTIES(sipctrl PROPERTIES OUTPUT_NAME "sipctrl")
+SET_TARGET_PROPERTIES(sipctrl PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(sipctrl ${CMAKE_DL_LIBS} pthread m)
diff --git a/core/plug-in/speex/CMakeLists.txt b/core/plug-in/speex/CMakeLists.txt
index 9beb3d23..b8b33296 100644
--- a/core/plug-in/speex/CMakeLists.txt
+++ b/core/plug-in/speex/CMakeLists.txt
@@ -3,8 +3,8 @@ set (speex_SRCS
 )
 
 # module_cflags  = -ansi # -DNOFPU
-add_library(speex SHARED ${speex_SRCS})
-set_target_properties(speex PROPERTIES OUTPUT_NAME "speex")
-set_target_properties(speex PROPERTIES PREFIX "")
-target_link_libraries(speex ${CMAKE_DL_LIBS} pthread ${SPEEX_LIBRARIES} m)
+ADD_LIBRARY(speex SHARED ${speex_SRCS})
+SET_TARGET_PROPERTIES(speex PROPERTIES OUTPUT_NAME "speex")
+SET_TARGET_PROPERTIES(speex PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(speex ${CMAKE_DL_LIBS} pthread ${SPEEX_LIBRARIES} m)
 
diff --git a/core/plug-in/stats/CMakeLists.txt b/core/plug-in/stats/CMakeLists.txt
index 652aeda5..d40f8016 100644
--- a/core/plug-in/stats/CMakeLists.txt
+++ b/core/plug-in/stats/CMakeLists.txt
@@ -10,8 +10,8 @@ query_stats.cxx
 ADD_EXECUTABLE (sems-stats ${sems_stats_SRCS})
 TARGET_LINK_LIBRARIES(sems-stats ${CMAKE_DL_LIBS} stdc++ m)
 
-add_library(stats SHARED ${stats_SRCS})
-set_target_properties(stats PROPERTIES OUTPUT_NAME "stats")
-set_target_properties(stats PROPERTIES PREFIX "")
-target_link_libraries(stats ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(stats SHARED ${stats_SRCS})
+SET_TARGET_PROPERTIES(stats PROPERTIES OUTPUT_NAME "stats")
+SET_TARGET_PROPERTIES(stats PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(stats ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/core/plug-in/uac_auth/CMakeLists.txt b/core/plug-in/uac_auth/CMakeLists.txt
index 541f6175..6eb5e20e 100644
--- a/core/plug-in/uac_auth/CMakeLists.txt
+++ b/core/plug-in/uac_auth/CMakeLists.txt
@@ -3,8 +3,8 @@ md5.c
 UACAuth.cpp
 )
 
-add_library(uac_auth SHARED ${uac_auth_SRCS})
-set_target_properties(uac_auth PROPERTIES OUTPUT_NAME "uac_auth")
-set_target_properties(uac_auth PROPERTIES PREFIX "")
-target_link_libraries(uac_auth ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(uac_auth SHARED ${uac_auth_SRCS})
+SET_TARGET_PROPERTIES(uac_auth PROPERTIES OUTPUT_NAME "uac_auth")
+SET_TARGET_PROPERTIES(uac_auth PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(uac_auth ${CMAKE_DL_LIBS} pthread m)
 
diff --git a/core/plug-in/wav/CMakeLists.txt b/core/plug-in/wav/CMakeLists.txt
index 67d67197..151d6bed 100644
--- a/core/plug-in/wav/CMakeLists.txt
+++ b/core/plug-in/wav/CMakeLists.txt
@@ -4,8 +4,8 @@ set (wav_SRCS
  wav_hdr.c
 )
 
-add_library(wav SHARED ${wav_SRCS})
-set_target_properties(wav PROPERTIES OUTPUT_NAME "wav")
-set_target_properties(wav PROPERTIES PREFIX "")
-target_link_libraries(wav ${CMAKE_DL_LIBS} pthread m)
+ADD_LIBRARY(wav SHARED ${wav_SRCS})
+SET_TARGET_PROPERTIES(wav PROPERTIES OUTPUT_NAME "wav")
+SET_TARGET_PROPERTIES(wav PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(wav ${CMAKE_DL_LIBS} pthread m)