[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "single-build-dir" updated.

[Commits to the Asterisk SCF project code repositories]

branch "single-build-dir" has been updated
  discards  3762dfd3b0a47cbaf22f4d7f1e8a5576323f0d76 (commit)
       via  11079f2e12fd9eb6cd597ed8c7cb85ca291110f4 (commit)
       via  6626b684faccb6679dac6698954f889afde6bb8d (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (3762dfd3b0a47cbaf22f4d7f1e8a5576323f0d76)
            \
             N -- N -- N (11079f2e12fd9eb6cd597ed8c7cb85ca291110f4)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Summary of changes:
 TestFixture/include/AsteriskSCF/IceBoxBoostTest.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 11079f2e12fd9eb6cd597ed8c7cb85ca291110f4
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Apr 25 17:48:58 2011 -0500

    Changes to work with new single-build-directory CMake script.

diff --git a/AmiCollector/test/CMakeLists.txt b/AmiCollector/test/CMakeLists.txt
index 14cf003..e095ba4 100644
--- a/AmiCollector/test/CMakeLists.txt
+++ b/AmiCollector/test/CMakeLists.txt
@@ -10,4 +10,4 @@ asterisk_scf_component_add_boost_libraries(ami-collector-test unit_test_framewor
 
 asterisk_scf_component_build_standalone(ami-collector-test)
 
-boost_add_test(ami-collector-test)
+asterisk_scf_test_boost(ami-collector-test)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b092bc7..2beaa3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,5 @@
+asterisk_scf_project(ice-util-cpp 3.4)
+
 if (integrated_build STREQUAL "true")
 	set(utils_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
 	set(utils_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
diff --git a/StateReplicator/test/CMakeLists.txt b/StateReplicator/test/CMakeLists.txt
index 075f348..43b0f1a 100644
--- a/StateReplicator/test/CMakeLists.txt
+++ b/StateReplicator/test/CMakeLists.txt
@@ -10,4 +10,4 @@ asterisk_scf_component_add_boost_libraries(StateReplicatorTest unit_test_framewo
 
 asterisk_scf_component_build_standalone(StateReplicatorTest)
 
-boost_add_test(StateReplicatorTest)
+asterisk_scf_test_boost(StateReplicatorTest)

commit 6626b684faccb6679dac6698954f889afde6bb8d
Author: Fred Anderson <fanderson at digium.com>
Date:   Tue Apr 26 11:37:31 2011 -0500

    Fixed warning message

diff --git a/TestFixture/include/AsteriskSCF/IceBoxBoostTest.h b/TestFixture/include/AsteriskSCF/IceBoxBoostTest.h
index 475d695..8819dc3 100644
--- a/TestFixture/include/AsteriskSCF/IceBoxBoostTest.h
+++ b/TestFixture/include/AsteriskSCF/IceBoxBoostTest.h
@@ -78,7 +78,7 @@ public:
 
 extern "C"
 {
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
 {
     return new IceBoxTest;
 }

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


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