[asterisk-scf-commits] asterisk-scf/integration/ice-util-c++.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Oct 18 09:12:48 CDT 2010
branch "master" has been updated
via b9b017c06cc06d8d53536ead0d2659454f9acdc3 (commit)
via a2c986f697ad21b4e400096efb24500998e1712f (commit)
from 1316c30cb230c1a54c08e5cc76290359d73bef89 (commit)
Summary of changes:
CMakeLists.txt | 7 +++++++
ProxyWrapper/CMakeLists.txt | 2 +-
ProxyWrapper/src/CMakeLists.txt | 11 ++++++-----
StateReplicator/CMakeLists.txt | 2 +-
StateReplicator/src/CMakeLists.txt | 10 +++++-----
StateReplicator/test/CMakeLists.txt | 16 ++++++++--------
StateReplicator/testslice/CMakeLists.txt | 4 ++--
7 files changed, 30 insertions(+), 22 deletions(-)
create mode 100644 CMakeLists.txt
- Log -----------------------------------------------------------------
commit b9b017c06cc06d8d53536ead0d2659454f9acdc3
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Oct 18 09:09:16 2010 -0500
Get rid of old project name from CMake files.
diff --git a/ProxyWrapper/CMakeLists.txt b/ProxyWrapper/CMakeLists.txt
index cdfa251..c5eb2ce 100644
--- a/ProxyWrapper/CMakeLists.txt
+++ b/ProxyWrapper/CMakeLists.txt
@@ -17,7 +17,7 @@ if(NOT integrated_build STREQUAL "true")
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/ProxyWrapper/src/CMakeLists.txt b/ProxyWrapper/src/CMakeLists.txt
index 8e47fab..d726910 100644
--- a/ProxyWrapper/src/CMakeLists.txt
+++ b/ProxyWrapper/src/CMakeLists.txt
@@ -1,12 +1,12 @@
# Define the SIP Channel Service component
-hydra_component_init(ProxyWrapper CXX)
+asterisk_scf_component_init(ProxyWrapper CXX)
-hydra_component_add_slice(ProxyWrapper ServiceLocatorIf)
-hydra_component_add_file(ProxyWrapper ProxyWrapper.h)
-hydra_component_add_file(ProxyWrapper ProxyWrapper.cpp)
+asterisk_scf_component_add_slice(ProxyWrapper ServiceLocatorIf)
+asterisk_scf_component_add_file(ProxyWrapper ProxyWrapper.h)
+asterisk_scf_component_add_file(ProxyWrapper ProxyWrapper.cpp)
-hydra_component_build_library(ProxyWrapper)
+asterisk_scf_component_build_library(ProxyWrapper)
# MACH-O requires libraries for linking libraries
if(APPLE)
@@ -14,5 +14,5 @@ if(APPLE)
target_link_libraries(ProxyWrapper ${ICE_CXX_LIB_ZeroCIce})
endif()
-hydra_component_install(ProxyWrapper LIBRARY lib "Proxy Wrapper" ProxyWrapper ARCHIVE DESTINATION lib)
+asterisk_scf_component_install(ProxyWrapper LIBRARY lib "Proxy Wrapper" ProxyWrapper ARCHIVE DESTINATION lib)
diff --git a/StateReplicator/CMakeLists.txt b/StateReplicator/CMakeLists.txt
index 69bf862..467e7b9 100644
--- a/StateReplicator/CMakeLists.txt
+++ b/StateReplicator/CMakeLists.txt
@@ -17,7 +17,7 @@ if(NOT integrated_build STREQUAL "true")
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/StateReplicator/src/CMakeLists.txt b/StateReplicator/src/CMakeLists.txt
index 725040f..28f589b 100644
--- a/StateReplicator/src/CMakeLists.txt
+++ b/StateReplicator/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/StateReplicator/test/CMakeLists.txt b/StateReplicator/test/CMakeLists.txt
index 5c7b3bc..5b6968a 100644
--- a/StateReplicator/test/CMakeLists.txt
+++ b/StateReplicator/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/StateReplicator/testslice/CMakeLists.txt b/StateReplicator/testslice/CMakeLists.txt
index ec356d7..09c6b67 100644
--- a/StateReplicator/testslice/CMakeLists.txt
+++ b/StateReplicator/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)
commit a2c986f697ad21b4e400096efb24500998e1712f
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Oct 14 17:42:53 2010 -0500
Add top-level CMakeLists.txt and fix compile problem in ProxyWrapper.
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..79e7361
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,7 @@
+if (integrated_build STREQUAL "true")
+ set(utils_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+ set(utils_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+endif()
+
+add_subdirectory(ProxyWrapper)
+add_subdirectory(StateReplicator)
diff --git a/ProxyWrapper/src/CMakeLists.txt b/ProxyWrapper/src/CMakeLists.txt
index 039fdfd..8e47fab 100644
--- a/ProxyWrapper/src/CMakeLists.txt
+++ b/ProxyWrapper/src/CMakeLists.txt
@@ -2,6 +2,7 @@
hydra_component_init(ProxyWrapper CXX)
+hydra_component_add_slice(ProxyWrapper ServiceLocatorIf)
hydra_component_add_file(ProxyWrapper ProxyWrapper.h)
hydra_component_add_file(ProxyWrapper ProxyWrapper.cpp)
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice-util-c++.git
More information about the asterisk-scf-commits
mailing list