[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Apr 27 11:12:27 CDT 2011
branch "master" has been updated
via 82f2598d09ccf1f05bb7ec3da66324694434bde0 (commit)
from 41af13b549464e2ab353e7d1a22edd8dc7f2afe2 (commit)
Summary of changes:
CMakeLists.txt | 26 --------------------------
src/CMakeLists.txt | 26 ++++++++++----------------
test/CMakeLists.txt | 26 +++++++++++---------------
3 files changed, 21 insertions(+), 57 deletions(-)
- Log -----------------------------------------------------------------
commit 82f2598d09ccf1f05bb7ec3da66324694434bde0
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 5483175..6d12705 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,29 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# Bridging 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 common AsteriskSCF build infrastructure
- include(cmake/AsteriskSCF.cmake)
-
- # Take care of slice definitions
- add_subdirectory(slice)
-
- # logger is integrated into our build
- set(integrated_build true)
- add_subdirectory(logger)
-endif()
-
asterisk_scf_project(BridgingService 3.4)
add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8275f0f..edd252a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,13 @@
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(bridgeservice CXX)
+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})
include_directories(${utils_dir}/SmartProxy/include)
+
+asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+
+asterisk_scf_component_init(bridgeservice)
asterisk_scf_component_add_file(bridgeservice Service.cpp)
asterisk_scf_component_add_file(bridgeservice BridgeImpl.h)
asterisk_scf_component_add_file(bridgeservice BridgeImpl.cpp)
@@ -29,33 +36,20 @@ asterisk_scf_component_add_file(bridgeservice InternalExceptions.h)
asterisk_scf_component_add_file(bridgeservice BridgeServiceConfig.h)
asterisk_scf_component_add_file(bridgeservice ListenerManager.h)
asterisk_scf_component_add_slice(bridgeservice ./BridgeReplicatorIf.ice)
-
asterisk_scf_component_add_ice_libraries(bridgeservice IceStorm)
asterisk_scf_component_add_ice_libraries(bridgeservice IceBox)
asterisk_scf_component_add_boost_libraries(bridgeservice thread date_time)
-
-
-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(bridgeservice)
target_link_libraries(bridgeservice logging-client)
-
asterisk_scf_component_install(bridgeservice)
-asterisk_scf_component_init(BridgeReplicator CXX)
+asterisk_scf_component_init(BridgeReplicator)
include_directories(${utils_dir}/StateReplicator/include)
asterisk_scf_component_add_file(BridgeReplicator BridgeReplicatorService.cpp)
asterisk_scf_component_add_slice(BridgeReplicator ./BridgeReplicatorIf.ice)
asterisk_scf_component_add_ice_libraries(BridgeReplicator IceStorm)
asterisk_scf_component_add_boost_libraries(BridgeReplicator thread date_time)
asterisk_scf_component_build_icebox(BridgeReplicator)
-
target_link_libraries(BridgeReplicator logging-client)
target_link_libraries(BridgeReplicator asterisk-scf-api)
-
asterisk_scf_component_install(BridgeReplicator)
-
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b74c1e9..ba3482d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,9 +2,18 @@ asterisk_scf_slice_include_directories(${API_SLICE_DIR})
if(NOT integrated_build STREQUAL "true")
add_subdirectory(channel_driver/local_slice)
endif()
-asterisk_scf_component_init(bridge_component_test CXX)
include_directories("../src")
include_directories(${utils_dir}/SmartProxy/include)
+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})
+if(integrated_build STREQUAL "true")
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../test_channel/local_slice/generated)
+endif()
+
+asterisk_scf_component_init(bridge_component_test)
asterisk_scf_component_add_slice(bridge_component_test CommandsIf)
asterisk_scf_component_add_file(bridge_component_test TestBridging.cpp)
asterisk_scf_component_add_file(bridge_component_test BridgeListenerI.h)
@@ -14,19 +23,9 @@ asterisk_scf_component_add_file(bridge_component_test BridgeManagerListenerI.cpp
asterisk_scf_component_add_file(bridge_component_test TestCommandDriver.cpp)
asterisk_scf_component_add_file(bridge_component_test TestCommandDriver.h)
asterisk_scf_component_add_slice(bridge_component_test ../src/BridgeReplicatorIf.ice)
-
asterisk_scf_component_add_ice_libraries(bridge_component_test IceStorm)
asterisk_scf_component_add_ice_libraries(bridge_component_test IceBox)
asterisk_scf_component_add_boost_libraries(bridge_component_test unit_test_framework 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})
-if(integrated_build STREQUAL "true")
- include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../test_channel/local_slice/generated)
-endif()
asterisk_scf_component_build_icebox(bridge_component_test)
target_link_libraries(bridge_component_test logging-client)
target_link_libraries(bridge_component_test asterisk-scf-api)
@@ -37,7 +36,7 @@ if(integrated_build STREQUAL "true")
asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
endif()
-asterisk_scf_component_init(bridge_unit_tests CXX)
+asterisk_scf_component_init(bridge_unit_tests)
asterisk_scf_component_add_slice(bridge_unit_tests ../src/BridgeReplicatorIf.ice)
asterisk_scf_component_add_file(bridge_unit_tests ../src/SessionCollection.cpp)
asterisk_scf_component_add_file(bridge_unit_tests ../src/SessionOperations.cpp)
@@ -47,8 +46,5 @@ asterisk_scf_component_add_file(bridge_unit_tests UnitTests.cpp)
asterisk_scf_component_add_ice_libraries(bridge_component_test Ice)
asterisk_scf_component_add_boost_libraries(bridge_unit_tests unit_test_framework thread)
asterisk_scf_component_build_standalone(bridge_unit_tests)
-
target_link_libraries(bridge_unit_tests logging-client)
target_link_libraries(bridge_unit_tests asterisk-scf-api)
-
-
-----------------------------------------------------------------------
--
asterisk-scf/release/bridging.git
More information about the asterisk-scf-commits
mailing list