[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  281707ff4e318882812f1a6eae8fc248dc988042 (commit)
      from  e0b3a56225e46edc92bd75c5b1eb68e25778523f (commit)

Summary of changes:
 SmartProxy/CMakeLists.txt                |    5 +++--
 StateReplicator/CMakeLists.txt           |    2 --
 StateReplicator/test/CMakeLists.txt      |    3 +--
 StateReplicator/testslice/CMakeLists.txt |    5 -----
 4 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 StateReplicator/testslice/CMakeLists.txt


- Log -----------------------------------------------------------------
commit 281707ff4e318882812f1a6eae8fc248dc988042
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 12 19:06:34 2011 -0600

    Building a single API library.

diff --git a/SmartProxy/CMakeLists.txt b/SmartProxy/CMakeLists.txt
index e7ae3c4..3b38e29 100644
--- a/SmartProxy/CMakeLists.txt
+++ b/SmartProxy/CMakeLists.txt
@@ -12,7 +12,6 @@ asterisk_scf_component_init(SmartProxy CXX)
 
 include_directories(include)
 
-asterisk_scf_component_add_slice(SmartProxy ServiceLocatorIf)
 asterisk_scf_component_add_file(SmartProxy include/AsteriskSCF/SmartProxy.h)
 asterisk_scf_component_add_file(SmartProxy src/SmartProxy.cpp)
 asterisk_scf_component_add_boost_libraries(SmartProxy core)
@@ -21,9 +20,11 @@ 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_library(SmartProxy)
 
+include_directories(${API_INCLUDE_DIR})
 target_link_libraries(SmartProxy logging-client)
 
-asterisk_scf_component_install(SmartProxy LIBRARY lib "Smart Proxy" SmartProxy ARCHIVE DESTINATION lib)
\ No newline at end of file
+install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR})
diff --git a/StateReplicator/CMakeLists.txt b/StateReplicator/CMakeLists.txt
index 098efcb..ca5f819 100644
--- a/StateReplicator/CMakeLists.txt
+++ b/StateReplicator/CMakeLists.txt
@@ -20,7 +20,5 @@ asterisk_scf_component_build_library(StateReplicator)
 
 asterisk_scf_component_install(StateReplicator LIBRARY lib "State Replicator" statereplicator ARCHIVE DESTINATION lib)
 
-
-add_subdirectory(testslice)
 add_subdirectory(test)
 
diff --git a/StateReplicator/test/CMakeLists.txt b/StateReplicator/test/CMakeLists.txt
index e00b507..5ff08fd 100644
--- a/StateReplicator/test/CMakeLists.txt
+++ b/StateReplicator/test/CMakeLists.txt
@@ -2,11 +2,10 @@
 
 asterisk_scf_component_init(StateReplicatorTest CXX)
 include_directories("../include")
-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)
-
+asterisk_scf_component_add_slice(StateReplicatorTest ../testslice/StateReplicatorTestIf.ice)
 asterisk_scf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
 
 asterisk_scf_component_build_standalone(StateReplicatorTest)
diff --git a/StateReplicator/testslice/CMakeLists.txt b/StateReplicator/testslice/CMakeLists.txt
deleted file mode 100644
index 09c6b67..0000000
--- a/StateReplicator/testslice/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Compile State Replicator Test Component's slice
-
-asterisk_scf_slice_include_directories("${CMAKE_SOURCE_DIR}/slice") 
-asterisk_scf_compile_slice(StateReplicatorTestIf.ice lib "State Replicator Test Slice Types" Test)
-

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


-- 
asterisk-scf/release/ice-util-cpp.git