[asterisk-scf-commits] asterisk-scf/integration/statereplicator.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Oct 14 19:01:09 CDT 2010
branch "master" has been updated
via 91fce993b008d94c242770ac65f3be7b73d8fd1e (commit)
from 627f3d8682d9553194ca9beaee55f532742bcec0 (commit)
Summary of changes:
CMakeLists.txt | 4 ++--
src/CMakeLists.txt | 10 +++++-----
test/CMakeLists.txt | 16 ++++++++--------
testslice/CMakeLists.txt | 4 ++--
4 files changed, 17 insertions(+), 17 deletions(-)
- Log -----------------------------------------------------------------
commit 91fce993b008d94c242770ac65f3be7b73d8fd1e
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Oct 14 19:02:23 2010 -0500
Replacing references to project's old internal working name.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69bf862..ebc637c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ if(NOT integrated_build STREQUAL "true")
# Minimum we require is 2.6
cmake_minimum_required(VERSION 2.6)
- # Include common Hydra build infrastructure. Make sure your submodules are pulled.
+ # Include common AsteriskSCF build infrastructure. Make sure your submodules are pulled.
include(cmake/AsteriskSCF.cmake)
# This project is C++ based and requires a minimum of 3.4 of Ice.
- hydra_project(SipChannelService 3.4 CXX)
+ asterisk_scf_project(SipChannelService 3.4 CXX)
# Pull in the slice definitions
#add_subdirectory(slice)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 725040f..28f589b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,11 @@
# Define the SIP Channel Service component
-hydra_component_init(StateReplicator CXX)
+asterisk_scf_component_init(StateReplicator CXX)
-hydra_component_add_file(StateReplicator StateReplicator.h)
-hydra_component_add_file(StateReplicator StateReplicator.cpp)
+asterisk_scf_component_add_file(StateReplicator StateReplicator.h)
+asterisk_scf_component_add_file(StateReplicator StateReplicator.cpp)
-hydra_component_build_library(StateReplicator)
+asterisk_scf_component_build_library(StateReplicator)
# MACH-O requires libraries for linking libraries
if(APPLE)
@@ -13,5 +13,5 @@ if(APPLE)
target_link_libraries(StateReplicator ${ICE_CXX_LIB_ZeroCIce})
endif()
-hydra_component_install(StateReplicator LIBRARY lib "State Replicator" statereplicator ARCHIVE DESTINATION lib)
+asterisk_scf_component_install(StateReplicator LIBRARY lib "State Replicator" statereplicator ARCHIVE DESTINATION lib)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5c7b3bc..5b6968a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,15 +1,15 @@
# Create State Replicator Test project.
-hydra_component_init(StateReplicatorTest CXX)
+asterisk_scf_component_init(StateReplicatorTest CXX)
include_directories("../src")
-hydra_component_add_slice(StateReplicatorTest StateReplicatorTestIf)
-hydra_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
-hydra_component_add_file(StateReplicatorTest SharedTestData.h)
-hydra_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
+asterisk_scf_component_add_slice(StateReplicatorTest StateReplicatorTestIf)
+asterisk_scf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
+asterisk_scf_component_add_file(StateReplicatorTest SharedTestData.h)
+asterisk_scf_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
-hydra_component_add_boost_libraries(StateReplicatorTest unit_test_framework)
+asterisk_scf_component_add_boost_libraries(StateReplicatorTest unit_test_framework)
-hydra_component_build_standalone(StateReplicatorTest)
-hydra_component_install(StateReplicatorTest RUNTIME bin "StateReplicatorTest Component Test Driver." Test)
+asterisk_scf_component_build_standalone(StateReplicatorTest)
+asterisk_scf_component_install(StateReplicatorTest RUNTIME bin "StateReplicatorTest Component Test Driver." Test)
boost_add_test(StateReplicatorTest)
diff --git a/testslice/CMakeLists.txt b/testslice/CMakeLists.txt
index ec356d7..09c6b67 100644
--- a/testslice/CMakeLists.txt
+++ b/testslice/CMakeLists.txt
@@ -1,5 +1,5 @@
# Compile State Replicator Test Component's slice
-hydra_slice_include_directories("${CMAKE_SOURCE_DIR}/slice")
-hydra_compile_slice(StateReplicatorTestIf.ice lib "State Replicator Test Slice Types" Test)
+asterisk_scf_slice_include_directories("${CMAKE_SOURCE_DIR}/slice")
+asterisk_scf_compile_slice(StateReplicatorTestIf.ice lib "State Replicator Test Slice Types" Test)
-----------------------------------------------------------------------
--
asterisk-scf/integration/statereplicator.git
More information about the asterisk-scf-commits
mailing list