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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  c7e5b4344e2f6745eeae14f1d77b6606a32475f7 (commit)
      from  2e4c74f5339433707eec29646d525d90be864ecc (commit)

Summary of changes:
 CMakeLists.txt     |   36 ------------------------------------
 src/CMakeLists.txt |   48 ++++++++++++------------------------------------
 2 files changed, 12 insertions(+), 72 deletions(-)


- Log -----------------------------------------------------------------
commit c7e5b4344e2f6745eeae14f1d77b6606a32475f7
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 7542ebb..b92cc73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,39 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# SIP Session Manager build system
-
-if(NOT integrated_build STREQUAL "true")
-
-   # Minimum we require is 2.8
-   cmake_minimum_required(VERSION 2.8)
-
-   # Include common AsteriskSCF build infrastructure. Make sure your submodules
-   # are pulled.
-   include(cmake/AsteriskSCF.cmake)
-
-   # Include pjproject build integration
-   include(cmake/modules/pjproject.cmake)
-   pjproject_build(pjlib)
-   pjproject_build(pjlib-util)
-   pjproject_build(pjnath)
-   pjproject_build(pjmedia)
-   pjproject_build(pjsip)
-   pjproject_build(third_party)
-
-   # Pull in the slice definitions
-   add_subdirectory(slice)
-
-   # logger is integrated into our build
-   set(integrated_build true)
-   add_subdirectory(logger)
-endif()
-
 asterisk_scf_project(SipSessionManager 3.4)
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 18a4bfd..254d404 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,14 @@
-# Define the SIP Session Manager component
+if(NOT logger_dir)
+  message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
+endif()
+include_directories(${logger_dir}/include)
+include_directories(${utils_dir}/StateReplicator/include)
+include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${API_INCLUDE_DIR})
 
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
-asterisk_scf_component_init(SipSessionManager CXX)
-
-# Add our component's own slice types.
-
+asterisk_scf_component_init(SipSessionManager)
 asterisk_scf_component_add_file(SipSessionManager SipSessionManagerApp.cpp)
 asterisk_scf_component_add_file(SipSessionManager SipSessionManagerEventPublisher.cpp)
 asterisk_scf_component_add_file(SipSessionManager SipSessionManagerEventPublisher.h)
@@ -32,53 +35,26 @@ asterisk_scf_component_add_file(SipSessionManager SipConfiguration.h)
 asterisk_scf_component_add_file(SipSessionManager SipStateReplicatorListener.cpp)
 asterisk_scf_component_add_file(SipSessionManager SipStateReplicator.h)
 asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipIf.ice)
-asterisk_scf_component_add_slice(SipSessionManager
-    ../local-slice/SipStateReplicationIf.ice)
+asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipStateReplicationIf.ice)
 asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipConfigurationIf.ice)
-
 asterisk_scf_component_add_ice_libraries(SipSessionManager IceStorm)
-
 asterisk_scf_component_add_boost_libraries(SipSessionManager core)
-
-if(NOT logger_dir)
-   message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${logger_dir}/include)
-
 asterisk_scf_component_build_icebox(SipSessionManager)
-
 target_link_libraries(SipSessionManager logging-client)
-
 pjproject_link(SipSessionManager pjsip)
 pjproject_link(SipSessionManager pjmedia)
 pjproject_link(SipSessionManager pjlib-util)
 pjproject_link(SipSessionManager pjlib)
-
 asterisk_scf_component_install(SipSessionManager)
 
-asterisk_scf_component_init(SipStateReplicator CXX)
-
-
-#This line allows us to use the templated state replicator
-#code from the SIP component. 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(SipStateReplicator)
 asterisk_scf_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
 asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.h)
-asterisk_scf_component_add_slice(SipStateReplicator
-    ../local-slice/SipStateReplicationIf.ice)
-asterisk_scf_component_add_slice(SipStateReplicator
-    ../local-slice/SipIf.ice)
-
+asterisk_scf_component_add_slice(SipStateReplicator ../local-slice/SipStateReplicationIf.ice)
+asterisk_scf_component_add_slice(SipStateReplicator ../local-slice/SipIf.ice)
 asterisk_scf_component_add_ice_libraries(SipStateReplicator IceStorm)
 asterisk_scf_component_add_boost_libraries(SipStateReplicator thread date_time)
-
 asterisk_scf_component_build_icebox(SipStateReplicator)
 target_link_libraries(SipStateReplicator logging-client)
 target_link_libraries(SipStateReplicator asterisk-scf-api)
-
 asterisk_scf_component_install(SipStateReplicator)

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


-- 
asterisk-scf/release/sip.git