[asterisk-scf-commits] asterisk-scf/release/routing.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Jun 1 17:14:24 CDT 2011
branch "master" has been updated
via 7c31780a5e1ecc65464ab9c104da8d7d6508f54d (commit)
via 77033c874cc87c98648e7642a288ed010555fd2c (commit)
from 8cb6c0106886c45b6ffaec07c4e48f455f935ded (commit)
Summary of changes:
src/CMakeLists.txt | 48 ++++++++----------------------------------------
test/CMakeLists.txt | 9 ++-------
2 files changed, 10 insertions(+), 47 deletions(-)
- Log -----------------------------------------------------------------
commit 7c31780a5e1ecc65464ab9c104da8d7d6508f54d
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 1 16:58:03 2011 -0500
More CMake script cleanup.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a3c2d3..53674ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,10 +47,9 @@ target_link_libraries(BasicRoutingService ${LUA_LIBRARIES})
target_link_libraries(BasicRoutingService logging-client)
target_link_libraries(BasicRoutingService Threading)
target_link_libraries(BasicRoutingService asterisk-scf-api)
+asterisk_scf_component_install(BasicRoutingService)
-#asterisk_scf_component_install(BasicRoutingService RUNTIME bin "Basic Routing Service" Core)
-
-asterisk_scf_component_init(BasicRoutingStateReplicator CXX)
+asterisk_scf_component_init(BasicRoutingStateReplicator)
asterisk_scf_component_add_slice(BasicRoutingStateReplicator ServiceLocatorIf)
asterisk_scf_component_add_slice(BasicRoutingStateReplicator ComponentServiceIf)
asterisk_scf_component_add_slice(BasicRoutingStateReplicator BasicRoutingStateReplicationIf)
@@ -61,5 +60,4 @@ asterisk_scf_component_add_ice_libraries(BasicRoutingStateReplicator IceStorm)
asterisk_scf_component_build_icebox(BasicRoutingStateReplicator)
target_link_libraries(BasicRoutingStateReplicator logging-client)
target_link_libraries(BasicRoutingStateReplicator asterisk-scf-api)
-
-#asterisk_scf_component_install(BasicRoutingStateReplicator RUNTIME bin "Basic Routing Service State Replicator" BasicRoutingStateReplicator)
+asterisk_scf_component_install(BasicRoutingStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a819f42..9eaa29e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories(${API_INCLUDE_DIR})
-include_directories(${utils_dir}/include)
+include_directories(${ice-util-cpp_dir}/include)
asterisk_scf_component_init(RoutingTest)
asterisk_scf_component_add_file(RoutingTest TestRouting.cpp)
commit 77033c874cc87c98648e7642a288ed010555fd2c
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 1 16:32:20 2011 -0500
Clean up CMake scripts and accomodate reorganized util-cpp repository.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0419c4..6a3c2d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,21 +1,15 @@
-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}/include)
+include_directories(${logger_dir}/include)
+include_directories(${util-cpp_dir}/include)
+include_directories(${ice-util-cpp_dir}/include)
+
find_package(Lua51 REQUIRED)
include_directories(${LUA_INCLUDE_DIR})
-include_directories(${util_cpp_dir}/Threading/include)
-include_directories(${util_cpp_dir}/StateMachine/include)
-
-asterisk_scf_component_init(BasicRoutingService)
asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+asterisk_scf_component_init(BasicRoutingService)
asterisk_scf_component_add_slice(BasicRoutingService ../local-slice/BasicRoutingStateReplicationIf.ice)
-
asterisk_scf_component_add_file(BasicRoutingService BasicRoutingServiceApp.cpp)
asterisk_scf_component_add_file(BasicRoutingService SessionRouter.cpp)
asterisk_scf_component_add_file(BasicRoutingService SessionRouter.h)
@@ -46,50 +40,26 @@ asterisk_scf_component_add_file(BasicRoutingService TestContext.h)
asterisk_scf_component_add_file(BasicRoutingService TestContext.cpp)
asterisk_scf_component_add_file(BasicRoutingService RoutingStateReplicatorListener.h)
asterisk_scf_component_add_file(BasicRoutingService RoutingStateReplicatorListener.cpp)
-
asterisk_scf_component_add_ice_libraries(BasicRoutingService IceStorm)
asterisk_scf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
-
asterisk_scf_component_build_icebox(BasicRoutingService)
-
target_link_libraries(BasicRoutingService ${LUA_LIBRARIES})
target_link_libraries(BasicRoutingService logging-client)
-
target_link_libraries(BasicRoutingService Threading)
target_link_libraries(BasicRoutingService asterisk-scf-api)
#asterisk_scf_component_install(BasicRoutingService RUNTIME bin "Basic Routing Service" Core)
-########################################
-# Basic Routing State replicator
-
asterisk_scf_component_init(BasicRoutingStateReplicator CXX)
-
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-
asterisk_scf_component_add_slice(BasicRoutingStateReplicator ServiceLocatorIf)
asterisk_scf_component_add_slice(BasicRoutingStateReplicator ComponentServiceIf)
asterisk_scf_component_add_slice(BasicRoutingStateReplicator BasicRoutingStateReplicationIf)
asterisk_scf_component_add_slice(BasicRoutingStateReplicator RoutingIf)
-
-# 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_add_file(BasicRoutingStateReplicator BasicRoutingStateReplicatorApp.cpp)
asterisk_scf_component_add_slice(BasicRoutingStateReplicator ../local-slice/BasicRoutingStateReplicationIf.ice)
-
asterisk_scf_component_add_ice_libraries(BasicRoutingStateReplicator IceStorm)
-
asterisk_scf_component_build_icebox(BasicRoutingStateReplicator)
-
target_link_libraries(BasicRoutingStateReplicator logging-client)
target_link_libraries(BasicRoutingStateReplicator asterisk-scf-api)
#asterisk_scf_component_install(BasicRoutingStateReplicator RUNTIME bin "Basic Routing Service State Replicator" BasicRoutingStateReplicator)
-
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a8ed76f..a819f42 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,5 @@
include_directories(${API_INCLUDE_DIR})
+include_directories(${utils_dir}/include)
asterisk_scf_component_init(RoutingTest)
asterisk_scf_component_add_file(RoutingTest TestRouting.cpp)
@@ -15,12 +16,6 @@ asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.h)
asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.cpp)
asterisk_scf_component_add_ice_libraries(RoutingTest IceStorm)
asterisk_scf_component_add_boost_libraries(RoutingTest unit_test_framework)
-
-include_directories(${utils_dir}/include)
-
asterisk_scf_component_build_icebox(RoutingTest)
target_link_libraries(RoutingTest asterisk-scf-api)
-
-if(integrated_build STREQUAL "true")
- asterisk_scf_test_icebox(RoutingTest config/routingtest-integ.config)
-endif()
+asterisk_scf_test_icebox(RoutingTest config/routingtest-integ.config)
-----------------------------------------------------------------------
--
asterisk-scf/release/routing.git
More information about the asterisk-scf-commits
mailing list