[asterisk-scf-commits] asterisk-scf/release/media_rtp_pjmedia.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2189bc87234ec3ab1635b8ae76a24369b4ac0a81 (commit)
      from  e605e6f1425c816fd588b9d5ee4c35215e1e9a40 (commit)

Summary of changes:
 src/CMakeLists.txt  |    6 ++----
 test/CMakeLists.txt |    5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 2189bc87234ec3ab1635b8ae76a24369b4ac0a81
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 12 19:06:34 2011 -0600

    Building a single API library.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71f793f..0c7dd07 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,10 +7,6 @@
 #
 
 asterisk_scf_component_init(media_rtp_pjmedia CXX)
-asterisk_scf_component_add_slice(media_rtp_pjmedia ServiceLocatorIf)
-asterisk_scf_component_add_slice(media_rtp_pjmedia MediaIf)
-asterisk_scf_component_add_slice(media_rtp_pjmedia MediaRTPIf)
-asterisk_scf_component_add_slice(media_rtp_pjmedia ComponentServiceIf)
 asterisk_scf_component_add_file(media_rtp_pjmedia MediaRTPpjmedia.cpp)
 asterisk_scf_component_add_file(media_rtp_pjmedia RTPSession.cpp)
 asterisk_scf_component_add_file(media_rtp_pjmedia RTPSource.cpp)
@@ -24,9 +20,11 @@ if(NOT logger_dir)
    message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
 endif()
 include_directories(${logger_dir}/include)
+include_directories(${API_INCLUDE_DIR})
 
 asterisk_scf_component_build_icebox(media_rtp_pjmedia)
 target_link_libraries(media_rtp_pjmedia logging-client)
+target_link_libraries(media_rtp_pjmedia asterisk-scf-api)
 pjproject_link(media_rtp_pjmedia pjlib)
 pjproject_link(media_rtp_pjmedia pjlib-util)
 pjproject_link(media_rtp_pjmedia pjmedia)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f7150af..6876f33 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,11 +8,10 @@
 
 asterisk_scf_component_init(media_rtp_pjmedia_test CXX)
 asterisk_scf_component_add_file(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
-asterisk_scf_component_add_slice(media_rtp_pjmedia_test MediaIf)
-asterisk_scf_component_add_slice(media_rtp_pjmedia_test MediaRTPIf)
 asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
+include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_icebox(media_rtp_pjmedia_test)
-#asterisk_scf_component_install(media_rtp_pjmedia_test RUNTIME bin "PJmedia RTP Media Test Driver." Core)
+target_link_libraries(media_rtp_pjmedia_test asterisk-scf-api)
 
 # integration test
 if(integrated_build STREQUAL "true")

-----------------------------------------------------------------------


-- 
asterisk-scf/release/media_rtp_pjmedia.git