[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  17066de364794f3befcdcca030ca31d349e83eea (commit)
      from  e9cf9f2e6dd03fe7bc39c363d72812aceed28367 (commit)

Summary of changes:
 AsteriskSCF.cmake |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 17066de364794f3befcdcca030ca31d349e83eea
Author: David M. Lee <dlee at digium.com>
Date:   Thu Oct 7 09:07:04 2010 -0500

    Changes for building on Mac OS X

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 230042f..8725d52 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -259,12 +259,19 @@ function(hydra_project NAME ICE_VERSION)
 	set(CMAKE_CXX_FLAGS_DEBUG "-g3 -Wall")
       endif()
       find_ICE_CXX()
-      find_ICE_CXX_library(Ice)
+      if(APPLE)
+        # On Mac, libIce is libZeroCIce
+        find_ICE_CXX_library(ZeroCIce)
+        set(ICE_CXX_LIB_Ice ${ICE_CXX_LIB_ZeroCIce})
+      else()
+        find_ICE_CXX_library(Ice)
+      endif()
       find_ICE_CXX_library(IceUtil)
       if(WIN32)
 	# On Windows, the IceUtil library must be explicitly linked
 	set(HYDRA_ICE_LIBRARIES_${l} Ice IceUtil PARENT_SCOPE)
       endif()
+      message(STATUS "Include directories ${ICE_CXX_INCLUDE_DIR}")
       include_directories("${ICE_CXX_INCLUDE_DIR}")
       message(STATUS "Passed requirement checks for CXX components")
     else()
@@ -622,6 +629,10 @@ function(hydra_compile_slice TARGET_IN DIR_IN DESC_IN GROUP_IN)
       if(target_libs)
 	target_link_libraries(${TARGET}_${lang} ${target_libs})
       endif()
+      if(APPLE)
+        target_link_libraries(${TARGET}_${lang} ${ICE_CXX_LIB_IceUtil})
+        target_link_libraries(${TARGET}_${lang} ${ICE_CXX_LIB_ZeroCIce})
+      endif()
       if(target_dependencies)
 	message(STATUS "Linking ${TARGET}_${lang} to ${target_dependencies}")
 	target_link_libraries(${TARGET}_${lang} ${target_dependencies})

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


-- 
asterisk-scf/release/cmake.git