[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  123ea2768f3372ba6ff51e2b60f147eb218b0097 (commit)
      from  37b6b32b5336299fac3895f36093d74d97c77a80 (commit)

Summary of changes:
 CMakeLists.txt      |   37 -------------------------------------
 src/CMakeLists.txt  |   43 +++++++++----------------------------------
 test/CMakeLists.txt |   13 +++----------
 3 files changed, 12 insertions(+), 81 deletions(-)


- Log -----------------------------------------------------------------
commit 123ea2768f3372ba6ff51e2b60f147eb218b0097
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Apr 27 11:10:48 2011 -0500

    CMakeLists.txt cleanup across the entire tree.
    
    * Consistent formatting.
    * Removed old non-integrated build stuff.
    * Organized include_directories() calls since they affect every component in
      the directory they are executed in.
    * Keep all scripts lines for each component together.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b74377d..dcbc5c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,40 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# pjmedia RTP component build system
-
-if(NOT integrated_build STREQUAL "true")
-
-   # Minimum we require is 2.8, any lower and stuff would fail horribly
-   cmake_minimum_required(VERSION 2.8)
-
-   # Include pjproject build integration
-   include(cmake/modules/pjproject.cmake)
-
-   # Include common AsteriskSCF build infrastructure
-   include(cmake/AsteriskSCF.cmake)
-
-   # Add build targets for what we will need to link against
-   pjproject_build(pjlib)
-   pjproject_build(pjlib-util)
-   pjproject_build(pjnath)
-   pjproject_build(pjmedia)
-   pjproject_build(third_party)
-
-   # Knock out slice definitions
-   add_subdirectory(slice EXCLUDE_FROM_ALL)
-
-   # logger is integrated into our build
-   set(integrated_build true)
-   add_subdirectory(logger)
-   set(integrated_build false)
-endif()
-
 asterisk_scf_project(media_rtp_pjmedia 3.4)
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f2b232..259dcdb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,18 +1,14 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-
-include_directories(${utils_dir}/StateReplicator/src)
-include_directories(${utils_dir}/SmartProxy/src)
+include_directories(${utils_dir}/StateReplicator/include)
+include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${API_INCLUDE_DIR})
+if(NOT logger_dir)
+  message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
+endif()
+include_directories(${logger_dir}/include)
 
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
-asterisk_scf_component_init(media_rtp_pjmedia CXX)
+asterisk_scf_component_init(media_rtp_pjmedia)
 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,13 +20,6 @@ asterisk_scf_component_add_file(media_rtp_pjmedia RtpStateReplicatorListener.cpp
 asterisk_scf_component_add_file(media_rtp_pjmedia RtpStateReplicator.h)
 asterisk_scf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpStateReplicationIf.ice)
 asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia core thread)
-
-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)
@@ -38,29 +27,15 @@ pjproject_link(media_rtp_pjmedia pjlib)
 pjproject_link(media_rtp_pjmedia pjlib-util)
 pjproject_link(media_rtp_pjmedia pjmedia)
 pjproject_link(media_rtp_pjmedia pjnath)
-
 asterisk_scf_component_install(media_rtp_pjmedia)
 
-asterisk_scf_component_init(RtpStateReplicator CXX)
-
-#This line allows us to use the templated state replicator
-#code. This statement is not the most permanent of changes
-#and assumes the directories are structured in the way that
-#gitall structures them.
-include_directories(${utils_dir}/StateReplicator/include)
-include_directories(${utils_dir}/SmartProxy/include)
-include_directories(${API_INCLUDE_DIR})
-
+asterisk_scf_component_init(RtpStateReplicator)
 asterisk_scf_component_add_file(RtpStateReplicator RtpStateReplicatorApp.cpp)
 asterisk_scf_component_add_file(RtpStateReplicator RtpStateReplicator.h)
 asterisk_scf_component_add_slice(RtpStateReplicator ../local-slice/RtpStateReplicationIf.ice)
-
 asterisk_scf_component_add_ice_libraries(RtpStateReplicator IceStorm)
-
 asterisk_scf_component_add_boost_libraries(RtpStateReplicator thread date_time)
-
 asterisk_scf_component_build_icebox(RtpStateReplicator)
 target_link_libraries(RtpStateReplicator asterisk-scf-api)
 target_link_libraries(RtpStateReplicator logging-client)
-
 asterisk_scf_component_install(RtpStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 117f097..c82fb29 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,22 +1,15 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
+include_directories(${API_INCLUDE_DIR})
 
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
-asterisk_scf_component_init(media_rtp_pjmedia_test CXX)
+asterisk_scf_component_init(media_rtp_pjmedia_test)
 asterisk_scf_component_add_file(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
 asterisk_scf_component_add_slice(media_rtp_pjmedia_test ../local-slice/RtpStateReplicationIf.ice)
 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)
 target_link_libraries(media_rtp_pjmedia_test asterisk-scf-api)
 
 # integration test
 if(integrated_build STREQUAL "true")
-   asterisk_scf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
+  asterisk_scf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
 endif()

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


-- 
asterisk-scf/release/media_rtp_pjmedia.git