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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  110785d6cb772f1138d7483167a1f0f8ce5662df (commit)
      from  4cfeb7a208a49f4b0be34130bbe755f5375840ab (commit)

Summary of changes:
 CMakeLists.txt             |   10 ----------
 local_slice/CMakeLists.txt |   21 +++++----------------
 src/CMakeLists.txt         |   14 +++++---------
 3 files changed, 10 insertions(+), 35 deletions(-)


- Log -----------------------------------------------------------------
commit 110785d6cb772f1138d7483167a1f0f8ce5662df
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 4cfd46e..70ce5fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,3 @@
-# Test channel
-
-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 common AsteriskSCF build infrastructure
-  include(cmake/AsteriskSCF.cmake)
-endif()
-
 asterisk_scf_project("Test Channel" 3.4)
 
 add_subdirectory(local_slice)
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 6ca7452..7121584 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1,22 +1,11 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
+asterisk_scf_add_ice_libraries(Ice IceUtil)
 
 asterisk_scf_component_init(test-channel-api CXX)
-
-asterisk_scf_component_add_slice(test-channel-api
-    AsteriskSCF/TestChannel/CommandsIf.ice)
-
-asterisk_scf_add_ice_libraries(Ice IceUtil)
+asterisk_scf_component_add_slice(test-channel-api AsteriskSCF/TestChannel/CommandsIf.ice)
 asterisk_scf_component_build_library(test-channel-api)
-
-set(TEST_CHANNEL_API_INCLUDE_DIR
-    ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
-
 asterisk_scf_component_install(test-channel-api)
+
 asterisk_scf_slice_headers_install()
 asterisk_scf_slice_install(AsteriskSCF)
+
+set(TEST_CHANNEL_API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 98e88b4..cc29ab6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,7 @@
-asterisk_scf_component_init(test_channel CXX)
+include_directories(${API_INCLUDE_DIR})
+include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
+
+asterisk_scf_component_init(test_channel)
 asterisk_scf_component_add_file(test_channel Service.cpp)
 asterisk_scf_component_add_file(test_channel MediaEchoThread.cpp)
 asterisk_scf_component_add_file(test_channel MediaSession.cpp)
@@ -7,22 +10,15 @@ asterisk_scf_component_add_file(test_channel TestEndpoint.h)
 asterisk_scf_component_add_ice_libraries(test_channel IceStorm)
 asterisk_scf_component_add_boost_libraries(test_channel thread)
 asterisk_scf_component_add_boost_libraries(test_channel date_time)
-
-include_directories(${API_INCLUDE_DIR})
-include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
 asterisk_scf_component_build_icebox(test_channel)
 target_link_libraries(test_channel asterisk-scf-api)
 target_link_libraries(test_channel test-channel-api)
-
 asterisk_scf_component_install(test_channel)
 
-asterisk_scf_component_init(console_driver CXX)
+asterisk_scf_component_init(console_driver)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.h)
 asterisk_scf_component_add_file(console_driver main.cpp)
-
-include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
 asterisk_scf_component_build_standalone(console_driver)
 target_link_libraries(console_driver test-channel-api)
-
 asterisk_scf_component_install(console_driver)

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


-- 
asterisk-scf/release/test_channel.git