[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  c1b57a49d5fd89a2cd3ed1d347c4e17d6e9fd830 (commit)
       via  24a0d6e7555d851cf672471076672fb929734130 (commit)
      from  82611f66431319b237fdb0a87fac57fbd3c3aa16 (commit)

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


- Log -----------------------------------------------------------------
commit c1b57a49d5fd89a2cd3ed1d347c4e17d6e9fd830
Author: David M. Lee <dlee at digium.com>
Date:   Fri Oct 1 12:17:51 2010 -0500

    Added icebox_add_test.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 8c94bd5..cad6cbf 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -121,6 +121,15 @@ function(find_ICE version)
   endif()
   file(TO_CMAKE_PATH "${ice}" ice_cmake_path)
   set_cache_var(ICE_DIR "${ice_cmake_path}")
+
+  # find icebox executable
+  find_program(ICEBOX icebox PATHS "${ICE_DIR}/bin" NO_DEFAULT_PATH)
+
+  if(ICEBOX)
+    message(STATUS "Found icebox at ${ICEBOX}")
+  else()
+    message(FATAL_ERROR "Failed to find icebox ${ICE_DIR}")
+  endif()
 endfunction()
 
 # Find Ice headers and libraries for CXX components
@@ -842,3 +851,7 @@ function(boost_add_test EXE)
       --report_sink=${CMAKE_BINARY_DIR}/${EXE}-result.xml
       --report_format=XML --report_level=detailed)
 endfunction()
+
+function(icebox_add_test NAME CONFIG)
+   add_test(NAME ${NAME} COMMAND ${ICEBOX} --Ice.Config=${CONFIG})
+endfunction()

commit 24a0d6e7555d851cf672471076672fb929734130
Author: David M. Lee <dlee at digium.com>
Date:   Fri Oct 1 12:17:25 2010 -0500

    Fixed building icebox libraries for Mac.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index cc7e9f2..8c94bd5 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -740,7 +740,10 @@ function(hydra_component_build_icebox COMPONENT)
   
   if(lang STREQUAL "CXX")
     # Now we actually create the library
-    add_library(${COMPONENT} MODULE ${${COMPONENT}_SOURCES})
+    # while one would think that MODULE would be the right setting, it
+    # has to be shared due to how icebox finds these libraries on a Mac
+    # (it loads .dylib instead of loading .so)
+    add_library(${COMPONENT} SHARED ${${COMPONENT}_SOURCES})
     # Link required libraries and Slice libraries
     list(APPEND boostlibs ${HYDRA_BOOST_LIBRARIES} ${${COMPONENT}_BOOST_LIBRARIES})
     if(boostlibs)

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


-- 
asterisk-scf/release/cmake.git