[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  df4537a88e8a9f42b3bb8e1c3030de31ef7a717a (commit)
       via  252d2c549a9b0e6c0b92e0e65896f93c108a44d7 (commit)
      from  f892a8393bee4e04986191f1a214ba6803d4c643 (commit)

Summary of changes:
 SmartProxy/src/CMakeLists.txt           |    6 ------
 StateReplicator/src/CMakeLists.txt      |    7 -------
 StateReplicator/src/StateReplicator.cpp |    2 --
 StateReplicator/src/StateReplicator.h   |    3 ++-
 4 files changed, 2 insertions(+), 16 deletions(-)


- Log -----------------------------------------------------------------
commit df4537a88e8a9f42b3bb8e1c3030de31ef7a717a
Author: David M. Lee <dlee at digium.com>
Date:   Wed Dec 8 14:59:44 2010 -0600

    Tightened up state replicator's dependencies.

diff --git a/StateReplicator/src/CMakeLists.txt b/StateReplicator/src/CMakeLists.txt
index 1dc097d..3eb7d57 100644
--- a/StateReplicator/src/CMakeLists.txt
+++ b/StateReplicator/src/CMakeLists.txt
@@ -8,12 +8,5 @@ asterisk_scf_component_add_boost_libraries(StateReplicator thread)
 
 asterisk_scf_component_build_library(StateReplicator)
 
-# MACH-O requires libraries for linking libraries
-if(APPLE)
-  target_link_libraries(StateReplicator ${ICE_CXX_LIB_IceUtil})
-  target_link_libraries(StateReplicator ${ICE_CXX_LIB_ZeroCIce})
-endif()
-
-
 asterisk_scf_component_install(StateReplicator LIBRARY lib "State Replicator" statereplicator ARCHIVE DESTINATION lib)
 
diff --git a/StateReplicator/src/StateReplicator.cpp b/StateReplicator/src/StateReplicator.cpp
index 5674a57..a2b6af7 100644
--- a/StateReplicator/src/StateReplicator.cpp
+++ b/StateReplicator/src/StateReplicator.cpp
@@ -14,8 +14,6 @@
  * at the top of the source tree.
  */
 
-#include <IceUtil/UUID.h>
-
 #include "StateReplicator.h"
 
 namespace AsteriskSCF
diff --git a/StateReplicator/src/StateReplicator.h b/StateReplicator/src/StateReplicator.h
index b778aeb..425d2fb 100644
--- a/StateReplicator/src/StateReplicator.h
+++ b/StateReplicator/src/StateReplicator.h
@@ -15,7 +15,8 @@
  */
 #pragma once
 
-#include <Ice/Ice.h>
+#include <Ice/Exception.h>
+#include <Ice/Current.h>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
 

commit 252d2c549a9b0e6c0b92e0e65896f93c108a44d7
Author: David M. Lee <dlee at digium.com>
Date:   Wed Dec 8 14:31:27 2010 -0600

    Ice libraries link more sanely now.

diff --git a/SmartProxy/src/CMakeLists.txt b/SmartProxy/src/CMakeLists.txt
index 2d38072..af426fb 100644
--- a/SmartProxy/src/CMakeLists.txt
+++ b/SmartProxy/src/CMakeLists.txt
@@ -15,12 +15,6 @@ include_directories(${logger_dir}/client/src)
 
 asterisk_scf_component_build_library(SmartProxy)
 
-# MACH-O requires libraries for linking libraries
-if(APPLE)
-  target_link_libraries(SmartProxy ${ICE_CXX_LIB_IceUtil})
-  target_link_libraries(SmartProxy ${ICE_CXX_LIB_ZeroCIce})
-endif()
-
 target_link_libraries(SmartProxy logging-client)
 
 asterisk_scf_component_install(SmartProxy LIBRARY lib "Smart Proxy" SmartProxy ARCHIVE DESTINATION lib)

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


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